diff --git a/frontend/client/modules/crm/src/views/lead/record/detail-side.js b/frontend/client/modules/crm/src/views/lead/record/detail-side.js
index 070dc776c5..63829210f6 100644
--- a/frontend/client/modules/crm/src/views/lead/record/detail-side.js
+++ b/frontend/client/modules/crm/src/views/lead/record/detail-side.js
@@ -35,13 +35,13 @@ Espo.define('Crm:Views.Lead.Record.DetailSide', 'Views.Record.DetailSide', funct
                         mode: 'detail',
                     }
                 };
-                if (this.model.get('createdAccountId')) {
+                if (this.model.get('createdAccountId') && this.model.get('createdAccountName')) {
                     panel.options.fields.push('createdAccount');
                 }
-                if (this.model.get('createdContactId')) {
+                if (this.model.get('createdContactId') && this.model.get('createdContactName')) {
                     panel.options.fields.push('createdContact');
                 }
-                if (this.model.get('createdOpportunityId')) {
+                if (this.model.get('createdOpportunityId') && this.model.get('createdOpportunityName')) {
                     panel.options.fields.push('createdOpportunity');
                 }
                 if (panel.options.fields.length) {
diff --git a/frontend/client/src/views/admin/layouts/mass-update.js b/frontend/client/src/views/admin/layouts/mass-update.js
index f55aa52872..d495cdd6d1 100644
--- a/frontend/client/src/views/admin/layouts/mass-update.js
+++ b/frontend/client/src/views/admin/layouts/mass-update.js
@@ -96,7 +96,7 @@ Espo.define('Views.Admin.Layouts.MassUpdate', 'Views.Admin.Layouts.Rows', functi
             if (this.ignoreTypeList.indexOf(model.getFieldParam(name, 'type')) != -1) {
                 return false;
             }
-            return !model.getFieldParam(name, 'disabled') && !model.getFieldParam(name, 'layoutMassUpdateDisabled');
+            return !model.getFieldParam(name, 'disabled') && !model.getFieldParam(name, 'layoutMassUpdateDisabled') && !model.getFieldParam(name, 'readOnly');
         }
 
     });