diff --git a/languages/de_de/Settings/Leads.php b/languages/de_de/Settings/Leads.php
index ed70c7cf27c71e84ff084efdde92327aab70db41..19e3803d2f8dfeddc4ed7508a2fcb1907900a93f 100644
--- a/languages/de_de/Settings/Leads.php
+++ b/languages/de_de/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , 
 	'JS_WITH'                      => 'with'                        , 
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', 
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping erfolgreich gespeichert',
 	'JS_phone'                     => 'Phone'                       , 
 	'JS_picklist'                  => 'Pick List'                   , 
 	'JS_email'                     => 'Email'                       , 
diff --git a/languages/en_gb/Settings/Leads.php b/languages/en_gb/Settings/Leads.php
index edf35f65b4e25dce567be116f68008ea0529590f..eb71162c204375a5cdd51b46e266856f29639606 100644
--- a/languages/en_gb/Settings/Leads.php
+++ b/languages/en_gb/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping Saved Successfully',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Picklist'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/en_us/Settings/Leads.php b/languages/en_us/Settings/Leads.php
index af3954ad7db6d2afc4f2e748a9f3842907d44af4..5e9ca66dc7ee83d7653ec36accf361fc9c182998 100644
--- a/languages/en_us/Settings/Leads.php
+++ b/languages/en_us/Settings/Leads.php
@@ -47,6 +47,7 @@ $jsLanguageStrings = array(
 	'JS_integer' => 'Integer',
 	'JS_IS_ALREADY_BEEN_MAPPED' => 'has already been mapped',
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully',
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping Saved Successfully',
 	'JS_multiSelectCombo' => 'Multi-Select Combo Box',
 	'JS_NONE' => 'None',
 	'JS_percent' => 'Percent',
diff --git a/languages/es_es/Settings/Leads.php b/languages/es_es/Settings/Leads.php
index b2b29d097ef63bac1b977893b799eb61ef25991a..74b5575d043a8db8e66000adc851aa4c156bded9 100644
--- a/languages/es_es/Settings/Leads.php
+++ b/languages/es_es/Settings/Leads.php
@@ -53,7 +53,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP' => 'No se puede asignar',
 	'JS_WITH' => 'con',
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Se ha eliminado la asignación',
-	
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapeo guardado con éxito',
 	//JS Field Type Translation
 	'JS_phone' => 'Teléfono',
 	'JS_picklist' => 'Lista Desplegable',
@@ -71,4 +71,4 @@ $jsLanguageStrings = array(
 	'JS_percent' => 'Porcentaje',
 	'JS_skype' => 'Skype',
 	'JS_integer' => 'Integer',
-);
+);
\ No newline at end of file
diff --git a/languages/es_mx/Settings/Leads.php b/languages/es_mx/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..8ca28148309484e9aab80d5d7a19f4343c331472 100644
--- a/languages/es_mx/Settings/Leads.php
+++ b/languages/es_mx/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapeo guardado con éxito',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/fr_fr/Settings/Leads.php b/languages/fr_fr/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..53cf17ddb773593dfea35c65686b935e9b1ba1ea 100644
--- a/languages/fr_fr/Settings/Leads.php
+++ b/languages/fr_fr/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping enregistré avec succès',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/hu_hu/Settings/Leads.php b/languages/hu_hu/Settings/Leads.php
index c9b409b2b87c22bf55a07c45b59a9b3a0683982b..112b452b9019594cfdaa7dcb4b9eb72071b83996 100644
--- a/languages/hu_hu/Settings/Leads.php
+++ b/languages/hu_hu/Settings/Leads.php
@@ -47,6 +47,7 @@ $jsLanguageStrings = array(
 	'JS_integer'					=> 'Egész szám'                 ,
 	'JS_IS_ALREADY_BEEN_MAPPED'    => 'már le van képezve'          ,
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Leképezés sikeresen törölve',
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping sikeresen mentve',
 	'JS_multiSelectCombo'          => 'Többszörös kiválasztó doboz' ,
 	'JS_NONE'                      => 'Nincs'                       ,
 	'JS_None'                      => 'Nincs'                       ,
@@ -60,4 +61,4 @@ $jsLanguageStrings = array(
 	'JS_time'                      => 'Idő'                         ,
 	'JS_url'                       => 'WEB Url'                     ,
 	'JS_WITH'                      => 'ezzel'                       ,
-);
+);
\ No newline at end of file
diff --git a/languages/it_it/Settings/Leads.php b/languages/it_it/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..a6aaf6e2cae65ee2a122a4bc70f980824f0ddc68 100644
--- a/languages/it_it/Settings/Leads.php
+++ b/languages/it_it/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mappatura salvato con successo',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/nl_nl/Settings/Leads.php b/languages/nl_nl/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..aeb3a5e0fbd342471cf78e2ffd9ac6178518db9b 100644
--- a/languages/nl_nl/Settings/Leads.php
+++ b/languages/nl_nl/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping Succesvol Opgeslagen',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/pt_br/Settings/Leads.php b/languages/pt_br/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..2f2d8f734fad525741775985df85d8efb288af6a 100644
--- a/languages/pt_br/Settings/Leads.php
+++ b/languages/pt_br/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapeamento Salvo com sucesso',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/ro_ro/Settings/Leads.php b/languages/ro_ro/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..b7c5cdf4d3460753486715586fb8e745d995d418 100644
--- a/languages/ro_ro/Settings/Leads.php
+++ b/languages/ro_ro/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping salvat cu succes',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/languages/ru_ru/Settings/Leads.php b/languages/ru_ru/Settings/Leads.php
index 1c0e0fad1c0a56d0d38015dab486852388423a63..080468c0d0648eb26dc2880b462a9ed31d907e23 100644
--- a/languages/ru_ru/Settings/Leads.php
+++ b/languages/ru_ru/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Не могу карту'                    , 
 	'JS_WITH'                      => 'с'                        , 
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Отображение успешно удален', 
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping Сохраненный Успешно',
 	'JS_phone'                     => 'Телефон'                       , 
 	'JS_picklist'                  => 'Памятка'                   , 
 	'JS_email'                     => 'E-mail'                       , 
diff --git a/languages/tr_tr/Settings/Leads.php b/languages/tr_tr/Settings/Leads.php
index c31909dae12e63db67cb0c6068b40e912e4a2fe3..5e77fb9849dd18947504d783f39a8265c467f618 100644
--- a/languages/tr_tr/Settings/Leads.php
+++ b/languages/tr_tr/Settings/Leads.php
@@ -42,6 +42,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP'                  => 'Cant map'                    , // TODO: Review
 	'JS_WITH'                      => 'with'                        , // TODO: Review
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully', // TODO: Review
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Haritalama Başarıyla Kaydedildi',
 	'JS_phone'                     => 'Phone'                       , // TODO: Review
 	'JS_picklist'                  => 'Pick List'                   , // TODO: Review
 	'JS_email'                     => 'Email'                       , // TODO: Review
diff --git a/layouts/vlayout/modules/Settings/Leads/LeadMappingEdit.tpl b/layouts/vlayout/modules/Settings/Leads/LeadMappingEdit.tpl
index 785221719533d292869deb5efd313d29bd843ffd..d1bcf74f770964dab35ddf05a4d17f5b119ab884 100644
--- a/layouts/vlayout/modules/Settings/Leads/LeadMappingEdit.tpl
+++ b/layouts/vlayout/modules/Settings/Leads/LeadMappingEdit.tpl
@@ -40,6 +40,7 @@
 								<td width="15%">
 									<input type="hidden" name="mapping[{$smarty.foreach.mappingLoop.iteration}][mappingId]" value="{$MAPPING_ID}"/>
 									<select class="leadsFields select2" style="width:180px" name="mapping[{$smarty.foreach.mappingLoop.iteration}][lead]">
+										<option data-type="{vtranslate('LBL_NONE', $QUALIFIED_MODULE)}" value="0" label="{vtranslate('LBL_NONE', $QUALIFIED_MODULE)}">{vtranslate('LBL_NONE', $QUALIFIED_MODULE)}</option>
 										{foreach key=FIELD_TYPE item=FIELDS_INFO from=$LEADS_MODULE_MODEL->getFields()}
 											{foreach key=FIELD_ID item=FIELD_OBJECT from=$FIELDS_INFO}
 												<option data-type="{$FIELD_TYPE}" {if $FIELD_ID eq $MAPPING_ARRAY['Leads']['id']} selected {/if} label="{vtranslate($FIELD_OBJECT->get('label'), $LEADS_MODULE_MODEL->getName())}" value="{$FIELD_ID}">
diff --git a/layouts/vlayout/modules/Settings/Leads/resources/LeadMapping.js b/layouts/vlayout/modules/Settings/Leads/resources/LeadMapping.js
index 85be9bd91504941b3dd5b52c2286274ee2738ae3..39a601a267d72ff1894661bc51cd7d617156e5b4 100644
--- a/layouts/vlayout/modules/Settings/Leads/resources/LeadMapping.js
+++ b/layouts/vlayout/modules/Settings/Leads/resources/LeadMapping.js
@@ -193,17 +193,15 @@ jQuery.Class("Settings_LeadMapping_Js",{
 					});
 				}
 				if(!data.result.status){
-                                    var notifyParams={
-                                            title:app.vtranslate('JS_INVALID_MAPPING'),
-                                            text:data.result,
-                                            type:'error',
-                                            width:'25%'
-                                    };
-				}
-				else{
+					var notifyParams={
+							title:app.vtranslate('JS_INVALID_MAPPING'),
+							text:data.result,
+							type:'error',
+							width:'25%'
+					};
+				} else {
 					notifyParams={
 						title:app.vtranslate('JS_MAPPING_SAVED_SUCCESSFULLY'),
-						text:data.result,
 						type:'info',
 						width:'25%'
 					};
diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Leads.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Leads.php
index 1176ef8667545bdca9ba91a1e40a9b028bbcbfed..0a06df6a46cb1abd513393476f9114f9f99ecaef 100644
--- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Leads.php
+++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Leads.php
@@ -45,7 +45,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP' => 'Cant map',
 	'JS_WITH' => 'with',
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mapping Deleted Successfully',
-	
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Mapping Saved Successfully',
 	//JS Field Type Translation
 	'JS_phone' => 'Phone',
 	'JS_picklist' => 'Pick List',
@@ -63,4 +63,4 @@ $jsLanguageStrings = array(
 	'JS_percent' => 'Percent',
 	'JS_skype' => 'Skype',
 	'JS_None' => 'None',
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Leads.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Leads.php
index aa3cb0cb1301f9ae385ef076fbab80865184563f..1d9b2bc12e30c930bcefc25ad0f4651aa970d8f2 100755
--- a/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Leads.php
+++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Leads.php
@@ -45,7 +45,7 @@ $jsLanguageStrings = array(
 	'JS_CANT_MAP' => 'Kan inte Mappa',
 	'JS_WITH' => 'med',
 	'JS_MAPPING_DELETED_SUCCESSFULLY' => 'Mappning Raderades Framgångsrikt',
-	
+	'JS_MAPPING_SAVED_SUCCESSFULLY' => 'Kartläggning sparats',
 	//JS Field Type Translation
 	'JS_phone' => 'Telefon',
 	'JS_picklist' => 'Plocklista',
@@ -64,4 +64,4 @@ $jsLanguageStrings = array(
 	'JS_skype' => 'Skype',
 	'JS_None' => 'Ingen',
 	'JS_integer' => 'Heltal',
-);
+);
\ No newline at end of file