diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index ef8ce33879ae59ca5dd67e514cf11864c2011757..35d7d09103284f4634f742b97b22c31d1f145025 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -328,9 +328,12 @@ $form["tabs"]['address'] = array (
 				2 => array( 'event' => 'SAVE',
 					'type' => 'TOLOWER')
 			),
-			'validators' => array (  0 => array ( 'type' => 'REGEX',
+			'validators' => array (  
+				0 => array ( 'type' => 'REGEX',
 					'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
 					'errmsg'=> 'email_error_isemail'),
+				1 => array ( 'type' => 'NOTEMPTY',
+					'errmsg'=> 'email_error_empty'),
 			),
 			'default' => '',
 			'value'  => '',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 822e96ab72b488dfb92ca8ce0b75ef7ed3c1253f..1b18f3d95447078d57d290816b331d6c3745a4a0 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -322,12 +322,17 @@ $form["tabs"]['address'] = array (
 		'email' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'filters'   => array( 0 => array( 'event' => 'SAVE',
-					'type' => 'IDNTOASCII'),
-				1 => array( 'event' => 'SHOW',
-					'type' => 'IDNTOUTF8'),
-				2 => array( 'event' => 'SAVE',
-					'type' => 'TOLOWER')
+			'filters'   => array(
+				0 => array( 'event' => 'SAVE','type' => 'IDNTOASCII'),
+				1 => array( 'event' => 'SHOW','type' => 'IDNTOUTF8'),
+				2 => array( 'event' => 'SAVE','type' => 'TOLOWER')
+			),
+			'validators' => array (
+				0 => array ( 'type' => 'REGEX',
+					'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}$/i',
+					'errmsg'=> 'email_error_isemail'),
+				1 => array ( 'type' => 'NOTEMPTY',
+					'errmsg'=> 'email_error_empty'),
 			),
 			'default' => '',
 			'value'  => '',
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index 4b4e75c1b4e4710d4970b71df3667a3396f36801..c9475479aae6427b8b2e035718e7e6cebe45a725 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index bfac98ce1a6cfa719aa85e403a6d5ede4b724873..9ba66cd0edb34d64c81d208c327f5967123326a0 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 1c19e893dc5a62f7207294499114574e8b9e3446..905c31a830ce38c158e3557fd3b78e650893393b 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index efd421058a5134d9ba318496864d7c299a928c72..dd8b754c9012576b40a46b7bd8109f96cd4d0a41 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index f00bed537cd71e4ec51ea540731107a955d571e4..fee9b804eeea62319a966f087fc2f43e86cd1c86 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index d6e2b5b3e70219275575211fde35d08571515466..dd67192d6f0163ff4b6e413481e5fc2c6c367547 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 681b7f48366de402ce3a9cfa9a1070e6f27af8a5..a837e8788b1d6577aa64026aba41e39f7cfc177b 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -155,5 +155,6 @@ $wb['added_by_txt'] = 'Kdo vytvořil účet';
 $wb['added_date_txt'] = 'Datum vytvoření účtu';
 $wb['parent_client_id_txt'] = 'Přiřazení klienta k distributorovi (prodejci)';
 $wb['none_txt'] = 'Žádný';
+$wb["email_error_empty"] = "Email is empty";
 ?>
 
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index c8807d89693b983c23459a66f8ff5dd964d9b6de..e2dfd32e9d1ada28fcb8d647496dcce72d7a084f 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -160,5 +160,8 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Klientské limity';
 $wb['err_msg_master_tpl_set'] = 'Nelze nastavit vlastní limity, pokud chtete nastavit vlatní limity musí být \\"hlavní šablona\\" nastavena na volbu \\"Custom\\".';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
 
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 7ee7226d8cc780c7e6f22c35ac8effe9aa034c90..a0afc87e4a21460740f51efc2a2aad0672cd82b3 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -177,4 +177,5 @@ $wb['reseller_txt'] = 'Reseller';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
 $wb['invalid_vat_id'] = 'Die USt.-ID ist ungültig.';
+$wb["email_error_empty"] = "Email ist leer";
 ?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 541b5d2dd18879d2c87f371d7565e610d18cbeb3..f6b0224263a2a103d3f19de94f11bf255f78e526 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -161,4 +161,7 @@ $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
 $wb['invalid_vat_id'] = 'Die USt.-ID ist ungültig.';
+$wb["btn_save_txt"] = "Speichern";
+$wb["btn_cancel_txt"] = "Abbrechen";
+$wb["email_error_empty"] = "Email ist leer";
 ?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 07a5c9f728418cc0ef902d8c3c49418a3d8dbb00..0ad8f865d251d9a64e67a448d52adec096562383 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 6e2c6c9c56308355e1f8aa374447467d009ce3ff..11f1de4d2be3ea5ad032c2efa70b76efe81f5c7e 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 663d27615a74809285043ecf1dd8510ce1f5ecbf..9514324878828b316dc7c5c78f7bcc23ac0500ca 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -199,4 +199,5 @@ $wb['reseller_txt'] = 'Reseller';
 $wb['btn_save_txt'] = "Save";
 $wb['btn_cancel_txt'] = "Cancel";
 $wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index eb47bfdecdd11a91a2361f273e6e3f08d4b13064..824f75035ff89c88b02b5e95868dabe319061ac4 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -197,4 +197,7 @@ $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than "custom" is selected.';
 $wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 92b3d49321615105b45964458d5bd6da99dad56d..2072dfccce4c9062463c4fff40eef48cc4144a84 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -158,4 +158,5 @@ $wb['none_txt'] = 'ninguno';
 $wb['limit_database_quota_txt'] = 'Cuota de base de datos';
 $wb['limit_database_quota_error_notint'] = 'Cuota de base de datos debe ser un número.';
 $wb['reseller_txt'] = 'Revendedor';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 086f385702c318d4fed5ad22b0bb6f31184254b6..bef77c0bdac2f5c17458f2830e1ad531edf9f0a3 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'El límite de dominios debe ser un nú
 $wb['limit_domainmodule_txt'] = 'Número máximo de dominios';
 $wb['client_limits_txt'] = 'Límites de Clientes';
 $wb['err_msg_master_tpl_set'] = 'Todas los límites personalizados se ignoran si se selecciona una plantilla principal distinta de \"custom\".';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index ca2544fa288ec24e6e4da3e5d9d8c489751990e6..aa2506c2500f626c340d73792c3048d77420e506 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index fb50513daf80504b87b0e8b81f2cbabe6387bd00..55ef19a6642cf56252ca6c86d34f5fe78526c0b9 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 4f07d0e948f8b6a44f45f4f041903b14e5334c6a..5dea56d78668e207dab8d04693a7f8ed05c75b2f 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -171,4 +171,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index fb72e3389ba6a1b7dc5fa0108a66e436ffdc41bf..ca033851f6d9dcbaa859ff5d6dcb0d683aba169a 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -175,4 +175,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 4f7bb70f68064e69eaedd781114f90d749c94a0c..736b780265fd4d28c1bbd963be586eed71befeef 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -155,6 +155,7 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
 
 
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index e16011347d6401827361923a5b6628eb89a0de42..2988b238c36806b447646a800abe29643c6252d0 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -160,6 +160,9 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domain module Limit';
 $wb['client_limits_txt'] = 'Limiti klijenata';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
 
 
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index bab1c676b0d0e2ebb887a39b3373af6e47a39bdf..80c43b85d6aecedb8d1c210b14b2b43b0757c962 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 03089e04681f4e540ef208f214dbafee3552bea1..bdbfceb23df37f50bd08d233a296e35b7988bcc5 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index 4c76c1ca550a54cd68621b773e00541fc04bd3b5..6ef65f67e4335cf5857580c33009752a9f7f3091 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index e06cb4bd1a7d72b12776cd14e2d851909dfd80db..c264ef90480ec11e3dc027aa50a6ab8602f3fc16 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index ddb725ec00d1fccf546c0f14d83380d4cdb6398b..4a2618422cdaf7746429b1605c34b9e8be5cbbea 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index bfac98ce1a6cfa719aa85e403a6d5ede4b724873..9ba66cd0edb34d64c81d208c327f5967123326a0 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index f2401e90ab21559cbf64aacedf41bd058c8bbc9a..875ac92daab616fc15baa38c62afe9957dc51351 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index 54ab7d40df62d2c76c68baf28d0ed78e4537a558..16b3831ff84d956ea731813a5cc9899702903ff9 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 320afce0d60e9a253c06f38d86e590c4d355b022..7772219537da4b71065d41db61ac31d12fdcb93c 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 5dffa203ada3f47c597f0d8e02cd090d6882d0fc..fcb709f67a0f7fdac950048d78120deebe3669e6 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 3d0664c8441c1997ece8737e3d34b9c377d7744a..19adef1044fb716573b8b5c551f8b04525b2042a 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index e8a6bc7b1fc425c9c668833c663f5ec1aa237e04..056094c54e0c55a4457eb46502fb91b6871a20d0 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index d3f7969cbcbd0a87a139c381f93da133903755ff..5f2a3972082c5d2074f01ace13d364e017dd0273 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index dc3b476943ba2f0d71a82651fe8c8d01b10f1d0a..05b1bf08e23bcadd760a89e48a2a60082b2e6dcc 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 4d39bf21f879ab8f6911c2982d41ccaa249ea73a..72bc88f579c989a62ec9cc815877884e3d0fdd6b 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index bfac98ce1a6cfa719aa85e403a6d5ede4b724873..9ba66cd0edb34d64c81d208c327f5967123326a0 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index ee91b186298fb20b6ab5ac0ac870aaf61287af8c..3c03cf4f6818455dd6dcbe5a4e07f70b90413bae 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index 2ce7db7c530899aefeec26a758552496ab4cc269..9e88277ebece469ec94b211dccc85c2a55467af8 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index 472b12209f5b049576d2684cd1e4970bc2faf9bd..7d4b58022dbeb65c81fdd572ffdc94371353b5b8 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Tillagd av';
 $wb['added_date_txt'] = 'Tillagd datum';
 $wb['parent_client_id_txt'] = 'Kund till återförsäljare';
 $wb['none_txt'] = 'ingen';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index bfac98ce1a6cfa719aa85e403a6d5ede4b724873..9ba66cd0edb34d64c81d208c327f5967123326a0 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index ec69f45f03adccc75ad5e4a9a12453763eabdb17..f8486e5b36a9ada9a554cde68edab5f7118e8957 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index f76b7834dd8d58135f4f1b6d187602eb26b9f06b..651eaaa788db708e1a12b1ee31a1fd78757f4e53 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 3d0ce9407975749f421cac01fb50b0f02561f8d5..67439c6ae214d1c7e721244f14f0d186d03c6c5e 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -155,4 +155,5 @@ $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
 $wb['none_txt'] = 'none';
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index b19727cfe8474dc5663dac42252dfe9bd2cce011..10566f04223716e2af2ecc2790bc1a52dff729f0 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -160,4 +160,7 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb["btn_save_txt"] = "Save";
+$wb["btn_cancel_txt"] = "Cancel";
+$wb["email_error_empty"] = "Email is empty";
 ?>
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 4069c474b0785253f1419211e3955c4236f4fd4a..c5c6cf309063904036d49fde6aac0c9884173b8a 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -81,7 +81,7 @@
                 <label for="fax" class="col-sm-3 control-label">{tmpl_var name='fax_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="fax" id="fax" value="{tmpl_var name='fax'}" class="form-control" /></div></div>
             <div class="form-group">
-                <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+                <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}*</label>
                 <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="internet" class="col-sm-3 control-label">{tmpl_var name='internet_txt'}</label>
@@ -146,4 +146,4 @@
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/client_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
\ No newline at end of file
+        </div></div>
diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index 4cc639a5dfc62cb90d1e1fd21ed8d33c6e1c3d29..d05b9fbda9f263476cd0718b2fd734a327469f9c 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/reseller_edit_address.htm
@@ -81,7 +81,7 @@
                 <label for="fax" class="col-sm-3 control-label">{tmpl_var name='fax_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="fax" id="fax" value="{tmpl_var name='fax'}" class="form-control" /></div></div>
             <div class="form-group">
-                <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+                <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}*</label>
                 <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="internet" class="col-sm-3 control-label">{tmpl_var name='internet_txt'}</label>
@@ -146,4 +146,4 @@
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/reseller_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/reseller_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
\ No newline at end of file
+        </div></div>