diff --git a/frontend/client/modules/crm/src/views/lead/convert.js b/frontend/client/modules/crm/src/views/lead/convert.js
index 20c9d225bc..4d2d192686 100644
--- a/frontend/client/modules/crm/src/views/lead/convert.js
+++ b/frontend/client/modules/crm/src/views/lead/convert.js
@@ -17,13 +17,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
-Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
+Espo.define('crm:views/lead/convert', 'View', function (Dep) {
 
     return Dep.extend({
 
-        template: 'crm:lead.convert',
+        template: 'crm:lead/convert',
 
         data: function () {
             return {
@@ -42,7 +42,7 @@ Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
                     $div.addClass('hide');
                 }
             },
-            'click button[data-action="convert"]': function (e) {            
+            'click button[data-action="convert"]': function (e) {
                 this.convert();
             },
             'click button[data-action="cancel"]': function (e) {
@@ -53,7 +53,7 @@ Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
         setup: function () {
             this.wait(true);
             this.id = this.options.id;
-            
+
             this.notify('Loading...');
 
             this.getModelFactory().create('Lead', function (model) {
@@ -76,20 +76,20 @@ Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
                 }
             }
             var i = 0;
-            
-            var attributeList = this.getFieldManager().getEntityAttributes(this.model.name);            
-            var ignoreAttributeList = ['createdAt', 'modifiedAt', 'modifiedById', 'modifiedByName', 'createdById', 'createdByName'];            
-            
+
+            var attributeList = this.getFieldManager().getEntityAttributes(this.model.name);
+            var ignoreAttributeList = ['createdAt', 'modifiedAt', 'modifiedById', 'modifiedByName', 'createdById', 'createdByName'];
+
             scopes.forEach(function (scope) {
                 this.getModelFactory().create(scope, function (model) {
                     model.populateDefaults();
-                    
+
                     this.getFieldManager().getEntityAttributes(model.name).forEach(function (attr) {
                         if (~attributeList.indexOf(attr) && !~ignoreAttributeList.indexOf(attr)) {
                             model.set(attr, this.model.get(attr), {silent: true}); 
                         }
                     }, this);
-                                    
+
                     for (var field in this.model.defs.convertFields[scope]) {
                         var leadField = this.model.defs.convertFields[scope][field];
                         var leadAttrs = this.getFieldManager().getAttributes(this.model.getFieldParam(leadField, 'type'), leadField);
@@ -118,8 +118,8 @@ Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
             }, this);
         },
 
-        convert: function () {            
-            
+        convert: function () {
+
             var scopes = [];
 
             this.scopes.forEach(function (scope) {
@@ -134,15 +134,17 @@ Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
                 return;
             }
 
+            this.getRouter().confirmLeaveOut = false;
+
             var notValid = false;
             scopes.forEach(function (scope) {
                 var editView = this.getView(scope);
                 editView.model.set(editView.fetch());
                 notValid = editView.validate() || notValid;
             }.bind(this));
-            
+
             var self = this;
-            
+
             var data = {
                 id: self.model.id,
                 records: {}
@@ -150,7 +152,7 @@ Espo.define('Crm:Views.Lead.Convert', 'View', function (Dep) {
             scopes.forEach(function (scope) {
                 data.records[scope] = self.getView(scope).model.attributes;
             });
-            
+
 
             if (!notValid) {
                 this.$el.find('[data-action="convert"]').addClass('disabled');
diff --git a/frontend/client/src/router.js b/frontend/client/src/router.js
index 8b4d2b4a04..330cddd6a2 100644
--- a/frontend/client/src/router.js
+++ b/frontend/client/src/router.js
@@ -39,9 +39,9 @@ Espo.define('router', [], function () {
 
         _last: null,
 
-        confirmLayout: false,
+        confirmLeaveOut: false,
 
-        confirmLeaveOutMessage: 'Are you sure?', 
+        confirmLeaveOutMessage: 'Are you sure?',
 
         initialize: function () {
             this.history = [];
@@ -51,9 +51,9 @@ Espo.define('router', [], function () {
         },
 
         execute: function (callback, args, name) {
-            if (this.confirmLayout) {
+            if (this.confirmLeaveOut) {
                 if (confirm(this.confirmLeaveOutMessage)) {
-                    this.confirmLayout = false;
+                    this.confirmLeaveOut = false;
                     Backbone.Router.prototype.execute.call(this, callback, args, name);
                 } else {
                     this.navigateBack({trigger: false});
diff --git a/frontend/client/src/views/record/detail.js b/frontend/client/src/views/record/detail.js
index 54129750ad..d33c45db83 100644
--- a/frontend/client/src/views/record/detail.js
+++ b/frontend/client/src/views/record/detail.js
@@ -109,8 +109,8 @@ Espo.define('Views.Record.Detail', 'Views.Record.Base', function (Dep) {
             }
         },
 
-        setConfirmLayout: function (value) {
-            this.getRouter().confirmLayout = value;
+        setConfirmLeaveOut: function (value) {
+            this.getRouter().confirmLeaveOut = value;
         },
 
         actionEdit: function () {
@@ -257,7 +257,7 @@ Espo.define('Views.Record.Detail', 'Views.Record.Base', function (Dep) {
         cancelEdit: function () {
             this.model.set(this.attributes);
             this.setDetailMode();
-            this.setConfirmLayout(false);
+            this.setConfirmLeaveOut(false);
         },
 
         delete: function () {
@@ -346,7 +346,7 @@ Espo.define('Views.Record.Detail', 'Views.Record.Base', function (Dep) {
             }
 
             this.on('remove', function () {
-                this.setConfirmLayout(false);
+                this.setConfirmLeaveOut(false);
             }, this);
 
             this.numId = Math.floor((Math.random() * 10000) + 1);
@@ -405,7 +405,7 @@ Espo.define('Views.Record.Detail', 'Views.Record.Base', function (Dep) {
 
             this.listenTo(this.model, 'change', function () {
                 if (this.mode == 'edit') {
-                    this.setConfirmLayout(true);
+                    this.setConfirmLeaveOut(true);
                 }
             }, this);
 
@@ -430,7 +430,7 @@ Espo.define('Views.Record.Detail', 'Views.Record.Base', function (Dep) {
                 this.notify('Saved', 'success');
             }
             this.enableButtons();
-            this.setConfirmLayout(false);
+            this.setConfirmLeaveOut(false);
         },
 
         beforeSave: function () {
diff --git a/frontend/client/src/views/record/edit.js b/frontend/client/src/views/record/edit.js
index aad29bb58d..59420750a1 100644
--- a/frontend/client/src/views/record/edit.js
+++ b/frontend/client/src/views/record/edit.js
@@ -56,7 +56,7 @@ Espo.define('Views.Record.Edit', 'Views.Record.Detail', function (Dep) {
         },
 
         actionCancel: function () {
-            this.setConfirmLayout(false);
+            this.setConfirmLeaveOut(false);
             this.cancel();
         },