diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index dbe5aa63e60cf8e18c7e921475439adcd64eb15c..e60ae0206e0db76cae81fcba78498a61049e05e9 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -7,3 +7,4 @@ ALTER TABLE `client_template` ADD `default_webserver` INT(11) NOT NULL DEFAULT 1
 ALTER TABLE `client_template` ADD `default_dnsserver` INT(11) NOT NULL DEFAULT 1;
 ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT(11) NOT NULL DEFAULT 1;
 ALTER TABLE `client_template` ADD `default_dbserver` INT(11) NOT NULL DEFAULT 1;
+ALTER TABLE  `client` ADD  `contact_firstname` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER  `gender`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 6fad9ef65240e36523d7169b0ba18f853c2525c2..7f81f7cd8e2ab78d27f75a002a765fb1e4b5a620 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -146,6 +146,7 @@ CREATE TABLE `client` (
   `company_name` varchar(64) DEFAULT NULL,
   `company_id` varchar(255) DEFAULT NULL,
   `gender` enum('','m','f') NOT NULL DEFAULT '',
+  `contact_firstname` varchar( 64 ) NOT NULL DEFAULT '',
   `contact_name` varchar(64) DEFAULT NULL,
   `customer_no` varchar(64) DEFAULT NULL,
   `vat_id` varchar(64) DEFAULT NULL,
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 5764266038c39b0c71a691110a2456ea6aec82f4..362545256f54860e541716c93f0bc7a91c733a60 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -106,6 +106,18 @@ $form["tabs"]['address'] = array (
 			'default' => '',
 			'value'  => array('' => '', 'm' => 'gender_m_txt', 'f' => 'gender_f_txt')
 		),
+		'contact_firstname' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '30',
+			'maxlength' => '255',
+			'rows'  => '',
+			'cols'  => '',
+			'searchable' => 1
+		),
 		'contact_name' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index fa469c944c19b678cdc873781988643837ff46d8..8efedf710d30fd7aaa84934c62ded69e21abac93 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -106,6 +106,18 @@ $form["tabs"]['address'] = array (
 			'default' => '',
 			'value'  => array('' => '', 'm' => 'gender_m_txt', 'f' => 'gender_f_txt')
 		),
+		'contact_firstname' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '30',
+			'maxlength' => '255',
+			'rows'  => '',
+			'cols'  => '',
+			'searchable' => 1
+		),
 		'contact_name' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index 6f14c605e0c0ac27dd085f943e176c588354e6dc..4b4e75c1b4e4710d4970b71df3667a3396f36801 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contact name';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index e09c419361bfcabaaed3992828129cd72d297b5a..bfac98ce1a6cfa719aa85e403a6d5ede4b724873 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contact name';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 61f28de43ff52f176f77b75e1bb6e0e88f101260..1c19e893dc5a62f7207294499114574e8b9e3446 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Макс. брой spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Макс. брой spamfilter policys';
 $wb['default_mailserver_txt'] = 'Пощенски сървър по подразбиране';
 $wb['company_name_txt'] = 'Компания';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Лице за контакт';
 $wb['username_txt'] = 'Потребителско име';
 $wb['password_txt'] = 'Парола';
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index 9f9ee5038b4d2608636bf8f3855c8f7436ab1f04..efd421058a5134d9ba318496864d7c299a928c72 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policys';
 $wb['default_mailserver_txt'] = 'Мейл сървър по подразбиране';
 $wb['company_name_txt'] = 'Име на компанията';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Име за контакти';
 $wb['username_txt'] = 'Потребителско име';
 $wb['password_txt'] = 'Парола';
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index 265752e25d0b842f95d8e7086b0f593b99b9e3cd..f00bed537cd71e4ec51ea540731107a955d571e4 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Número máximo de usuários de filtros spam
 $wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de filtros spam';
 $wb['default_mailserver_txt'] = 'Servidor de Correio Padrão';
 $wb['company_name_txt'] = 'Empresa';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contato';
 $wb['username_txt'] = 'Nome de Usuário';
 $wb['password_txt'] = 'Senha';
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index 96475784a4358326f4d63d05cbed15a92bc9baef..d6e2b5b3e70219275575211fde35d08571515466 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Número máximo de usuários de spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de spamfilter';
 $wb['default_mailserver_txt'] = 'Servidor de Correio Padrão';
 $wb['company_name_txt'] = 'Empresa';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contato';
 $wb['username_txt'] = 'Usuário';
 $wb['password_txt'] = 'Senha';
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 92f95a0bf7cc3faf23284b3b4680dabd042cc54c..a164dc11a0a12aa978569faf60fab64a2be77609 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
 $wb['default_mailserver_txt'] = 'Výchozí e-mailový server';
 $wb['company_name_txt'] = 'Název společnosti';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Název kontaktu';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['password_txt'] = 'Heslo';
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 3f78b05897b6d03e3ea6a821ee04950538f01308..7de0c0b3ab06006062baa9b20dcacd0eb2c971fa 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
 $wb['default_mailserver_txt'] = 'Výchozí e-mailový server';
 $wb['company_name_txt'] = 'Název společnosti';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Název kontaktu';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['password_txt'] = 'Heslo';
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 62bd31158e1c1a25e8f8d90c2113ec0c10a28ae9..dbaa9a59647361775c61ca874be73b6556b30b6c 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -13,7 +13,8 @@ $wb['limit_spamfilter_user_txt'] = 'Max. Anzahl an Spamfilter Benutzern';
 $wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
 $wb['default_mailserver_txt'] = 'Standardmailserver';
 $wb['company_name_txt'] = 'Firmenname';
-$wb['contact_name_txt'] = 'Kontakt';
+$wb['contact_firstname_txt'] = 'Vorname';
+$wb['contact_name_txt'] = 'Nachname';
 $wb['username_txt'] = 'Benutzername';
 $wb['password_txt'] = 'Passwort';
 $wb['language_txt'] = 'Sprache';
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 904f93dff2d4456fefcbb197a35036a4652b1bcd..1595e567b951dc4da9da07e1182984faf8aa4731 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -13,7 +13,8 @@ $wb['limit_spamfilter_user_txt'] = 'Max. Anzahl an Spamfilter Benutzern';
 $wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
 $wb['default_mailserver_txt'] = 'Standardmailserver';
 $wb['company_name_txt'] = 'Firmenname';
-$wb['contact_name_txt'] = 'Kontakt';
+$wb['contact_firstname_txt'] = 'Vorname';
+$wb['contact_name_txt'] = 'Nachname';
 $wb['username_txt'] = 'Benutzername';
 $wb['password_txt'] = 'Passwort';
 $wb['password_strength_txt'] = 'Passwortkomplexität';
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index e68db3172f479da0dd6353ce8caef6419893f7c0..07a5c9f728418cc0ef902d8c3c49418a3d8dbb00 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Όριο χρηστών spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Όριο πολιτικών spamfilter';
 $wb['default_mailserver_txt'] = 'Προκαθορισμένος Mailserver';
 $wb['company_name_txt'] = 'Όνομα εταιρίας';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
 $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 8c2f94e9dbb926d1e6f0bc11c10c4db5ec13ec36..578774bf6c7edd74db32fbdaa86be08b97469e7f 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Όριο χρηστών spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Όριο πολιτικών spamfilter';
 $wb['default_mailserver_txt'] = 'Προκαθορισμένος Mailserver';
 $wb['company_name_txt'] = 'Όνομα Εταιρίας';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Πρόσωπο Επικοινωνίας';
 $wb['username_txt'] = 'Όνομα Χρήστη';
 $wb['password_txt'] = 'Συνθηματικό';
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index c94ab12444fd03ec34d03ad6849d0fbfe81e7017..493ad190dc3b0fd18bb8d340df45fb0984b7ff7f 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -15,6 +15,7 @@ $wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
 $wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies';
 $wb["default_mailserver_txt"] = 'Default Mailserver';
 $wb["company_name_txt"] = 'Company name';
+$wb["contact_firstname_txt"] = 'Contact firstname';
 $wb["contact_name_txt"] = 'Contact name';
 $wb["username_txt"] = 'Username';
 $wb["password_txt"] = 'Password';
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index 3c8c07008e0075f66e2391c1a553ecfb0951b087..b94c30e86098d290f29066624c0adbae5fbd04bb 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -15,6 +15,7 @@ $wb["limit_spamfilter_user_txt"] = 'Max. number of spamfilter users';
 $wb["limit_spamfilter_policy_txt"] = 'Max. number of spamfilter policies';
 $wb["default_mailserver_txt"] = 'Default Mailserver';
 $wb["company_name_txt"] = 'Company name';
+$wb["contact_firstname_txt"] = 'Contact firstname';
 $wb["contact_name_txt"] = 'Contact name';
 $wb["username_txt"] = 'Username';
 $wb["password_txt"] = 'Password';
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 5bb3000a6a6fd00d7a57268168b9a537eb609b17..83d2833b913d561c7ad1816f1b42ef7264ce35ea 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_user_txt'] = 'Número máximo de usuarios de filtros de sp
 $wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de filtro de spam';
 $wb['default_mailserver_txt'] = 'Servidor de correo por defecto';
 $wb['company_name_txt'] = 'Nombre de la empresa';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nombre de contacto';
 $wb['username_txt'] = 'Usuario';
 $wb['password_txt'] = 'Contraseña';
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 6a88241e0d352c9241a834153b592814e1a8fcc4..086f385702c318d4fed5ad22b0bb6f31184254b6 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_user_txt'] = 'Número máximo de usuarios de filtros de sp
 $wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de filtro de spam';
 $wb['default_mailserver_txt'] = 'Servidor de correo por defecto';
 $wb['company_name_txt'] = 'Nombre de la empresa';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nombre de contacto';
 $wb['username_txt'] = 'Usuario';
 $wb['password_txt'] = 'Contraseña';
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index f4b5dfaf9c08c99a1a092a65fc496e24d6690653..ca2544fa288ec24e6e4da3e5d9d8c489751990e6 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Roskapostisuodattimen käyttäjien määrä'
 $wb['limit_spamfilter_policy_txt'] = 'Roskapostisuodattimen kohtelutapojen määrä';
 $wb['default_mailserver_txt'] = 'Oletuspostipalvelin';
 $wb['company_name_txt'] = 'Yrityksen nimi';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Yhteyshekilö';
 $wb['username_txt'] = 'Käyttäjätunnus';
 $wb['password_txt'] = 'Salasana';
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index 00ddbbc4e8a053213ebc895dfdd348299bcfe190..fb50513daf80504b87b0e8b81f2cbabe6387bd00 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Roskapostisuodattimen käyttäjien enimmäis
 $wb['limit_spamfilter_policy_txt'] = 'Roskapostin kohtelutapojen enimmäismäärä';
 $wb['default_mailserver_txt'] = 'Oletuspostipalvelin';
 $wb['company_name_txt'] = 'Yrityksen nimi';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Yhteyshenkilö';
 $wb['username_txt'] = 'Käyttäjätunnus';
 $wb['password_txt'] = 'Salasana';
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index ffb062d751354e95b4c1addc424a8bd3aa1f601a..4366fa1d97327c4e3d312b4e7a15370e4987b43e 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre ant
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['default_mailserver_txt'] = 'Serveur mail par défaut';
 $wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nom de contact';
 $wb['username_txt'] = 'Nom d\'utilisateur';
 $wb['password_txt'] = 'Mot de passe';
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index 83a26fd79f1c29c7cbf9f4a2501d180b58bbe5c3..0447db7b74a2bea29bc4634356786980ad6eea3f 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre ant
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['default_mailserver_txt'] = 'Serveur mail par défaut';
 $wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nom de contact';
 $wb['username_txt'] = 'Nom d\'utilisateur';
 $wb['password_txt'] = 'Mot de passe';
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 66357a5f77d2e46197973d8bc9ace109f9a48061..bcf3f20421f0fc599d41bafc9794a8e00e87dd35 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Maksimalan broj spamfilter korisnika';
 $wb['limit_spamfilter_policy_txt'] = 'Maksimalan broj spamfilter pravila';
 $wb['default_mailserver_txt'] = 'Izaberi email server';
 $wb['company_name_txt'] = 'Poduzeće';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kontakt osoba';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['password_txt'] = 'Å ifra';
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 98f09f2288cdd037975af20c4457018aa7080758..b282b34f76bc4b49b84198be2637689561bc8770 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Maksimalan broj spamfilter korisnika';
 $wb['limit_spamfilter_policy_txt'] = 'Maksimalan broj spamfilter pravila';
 $wb['default_mailserver_txt'] = 'Izaberi email server';
 $wb['company_name_txt'] = 'Poduzeće';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kontakt osoba';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['password_txt'] = 'Å ifra';
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index 91017a732273b1e01aa73d2219cacd13ccf6f0ad..bab1c676b0d0e2ebb887a39b3373af6e47a39bdf 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Alap levelező szerver';
 $wb['company_name_txt'] = 'Cégnév';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kapcsolattartó';
 $wb['username_txt'] = 'Felhasználónév';
 $wb['password_txt'] = 'Jelszó';
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 04ffa0728291b06d69776944c2e3e059f42512ec..03089e04681f4e540ef208f214dbafee3552bea1 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Cégnév';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kapcsolattartó';
 $wb['username_txt'] = 'Felhasználónév';
 $wb['password_txt'] = 'Jelszó';
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index a72da01fb73f136fc83b62f23f6315fedd191f8a..4c76c1ca550a54cd68621b773e00541fc04bd3b5 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Jumlah maks pengguna spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Jumlah maks kebijakan spamfilter';
 $wb['default_mailserver_txt'] = 'Server Mail Default';
 $wb['company_name_txt'] = 'Nama Perusahaan';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nama Kontak';
 $wb['username_txt'] = 'Nama Pengguna';
 $wb['password_txt'] = 'Kata Sandi';
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index cff0f155388d713a1f7020007285767a21645fbf..e06cb4bd1a7d72b12776cd14e2d851909dfd80db 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Jumlah maks pengguna spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Jumlah maks kebijakan spamfilter';
 $wb['default_mailserver_txt'] = 'Server Mail Default';
 $wb['company_name_txt'] = 'Nama Perusahaan';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nama Kontak';
 $wb['username_txt'] = 'Nama Pengguna';
 $wb['password_txt'] = 'Kata Sandi';
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 40151703e5392137616acc609071030e37290730..ddb725ec00d1fccf546c0f14d83380d4cdb6398b 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Numero massimo di spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Numero massimo di spamfilter policys';
 $wb['default_mailserver_txt'] = 'Mailserver predefinito';
 $wb['company_name_txt'] = 'Nome Azienda';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nome contatto';
 $wb['username_txt'] = 'Nome utente';
 $wb['password_txt'] = 'Password';
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index e09c419361bfcabaaed3992828129cd72d297b5a..bfac98ce1a6cfa719aa85e403a6d5ede4b724873 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contact name';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index 8189572e3d6e69eefae964050e5b12ebd738df20..f2401e90ab21559cbf64aacedf41bd058c8bbc9a 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = '迷惑メールフィルタのポリシーの最大数';
 $wb['default_mailserver_txt'] = 'デフォルトのメールサーバー';
 $wb['company_name_txt'] = '社名';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = '担当者名';
 $wb['username_txt'] = 'ユーザー名';
 $wb['password_txt'] = 'パスワード';
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index c427a83bcd62e911250265738b8d5a50e2ec9989..54ab7d40df62d2c76c68baf28d0ed78e4537a558 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'スパムフィルターユーザーの最
 $wb['limit_spamfilter_policy_txt'] = 'スパムフィルターポリシーの最大数';
 $wb['default_mailserver_txt'] = 'デフォルトのメールサーバー';
 $wb['company_name_txt'] = '社名';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = '担当者名';
 $wb['username_txt'] = 'ユーザー名';
 $wb['password_txt'] = 'パスワード';
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 899a1f6f11f44517bd0c077d5a03be9ba5c79612..320afce0d60e9a253c06f38d86e590c4d355b022 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -14,6 +14,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. aantal spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. aantal spamfilter policys';
 $wb['default_mailserver_txt'] = 'Standaard mailserver';
 $wb['company_name_txt'] = 'Bedrijfsnaam';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contactpersoon';
 $wb['username_txt'] = 'Gebruikersnaam';
 $wb['password_txt'] = 'Wachtwoord';
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 9ce48baed133bbf91ab887e6cc058b60bc9e6a01..5dffa203ada3f47c597f0d8e02cd090d6882d0fc 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. aantal spamfilter gebruikers';
 $wb['limit_spamfilter_policy_txt'] = 'Max. aantal spamfilter policys';
 $wb['default_mailserver_txt'] = 'Standaard Mailserver';
 $wb['company_name_txt'] = 'Bedrijfsnaam';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contactpersoon';
 $wb['username_txt'] = 'Gebruikersnaam';
 $wb['password_txt'] = 'Wachtwoord';
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index d8700816ffc3e43598b35d1cdd4c497b0976cc0d..3d0664c8441c1997ece8737e3d34b9c377d7744a 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Maksymalna ilość filtrów spamu użytkowni
 $wb['limit_spamfilter_policy_txt'] = 'Maksymalna ilość polityk filtrów spamu';
 $wb['default_mailserver_txt'] = 'Domyślny serwer e-mail';
 $wb['company_name_txt'] = 'Nazwa firmy';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nazwa kontaktu';
 $wb['username_txt'] = 'Nazwa użytkownika';
 $wb['password_txt'] = 'Hasło';
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 72bf2ae85efacc6a5136360935fbe1061fa01c1a..e8a6bc7b1fc425c9c668833c663f5ec1aa237e04 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Maksymalna ilość użytkowników z filtrem
 $wb['limit_spamfilter_policy_txt'] = 'Maksymalna ilość polityk filtrów spamu';
 $wb['default_mailserver_txt'] = 'Domyślny serwer poczty';
 $wb['company_name_txt'] = 'Nazwa firmy';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nazwa kontaktu';
 $wb['username_txt'] = 'Nazwa użytkownika';
 $wb['password_txt'] = 'Hasło';
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 30e85717e42860d4f639b0b60ea342e0e1196bd1..d3f7969cbcbd0a87a139c381f93da133903755ff 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Número máximo de utilizadors de filtros sp
 $wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de filtros spam';
 $wb['default_mailserver_txt'] = 'Servidor de Correio Padrão';
 $wb['company_name_txt'] = 'Empresa';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contato';
 $wb['username_txt'] = 'Nome de Utilizador ';
 $wb['password_txt'] = 'Senha';
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 3a58ae0c704d836270e754f0b7fe59adcebc24c0..dc3b476943ba2f0d71a82651fe8c8d01b10f1d0a 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Número máximo de utilizadors de spamfilter
 $wb['limit_spamfilter_policy_txt'] = 'Número máximo de políticas de spamfilter';
 $wb['default_mailserver_txt'] = 'Servidor de Correio Padrão';
 $wb['company_name_txt'] = 'Empresa';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contato';
 $wb['username_txt'] = 'Utilizador ';
 $wb['password_txt'] = 'Senha';
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index ec3138ba920b689ec2dc27b0a3fd4fd44fdddcb2..4d39bf21f879ab8f6911c2982d41ccaa249ea73a 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Numar maxim de filtre spam';
 $wb['limit_spamfilter_policy_txt'] = 'Numar maxim de reguli filtre spam ';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Nume companie';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nume Contact ';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Parola';
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index e09c419361bfcabaaed3992828129cd72d297b5a..bfac98ce1a6cfa719aa85e403a6d5ede4b724873 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contact name';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 780f1d7b219452afb8bfce8467b5e5c3c0f49aa9..ee91b186298fb20b6ab5ac0ac870aaf61287af8c 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Макс.число пользователе
 $wb['limit_spamfilter_policy_txt'] = 'Макс.число правил спам-фильтра';
 $wb['default_mailserver_txt'] = 'Почтовый сервер по-умолчанию';
 $wb['company_name_txt'] = 'Название компании';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Контактное лицо';
 $wb['username_txt'] = 'Логин';
 $wb['password_txt'] = 'Пароль';
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index ecf2f463ac70077445b2218894f0e76f4ce607ba..2ce7db7c530899aefeec26a758552496ab4cc269 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Макс. количество пользо
 $wb['limit_spamfilter_policy_txt'] = 'Макс. количество правил спам-фильтра';
 $wb['default_mailserver_txt'] = 'Mail-сервер по-умолчанию';
 $wb['company_name_txt'] = 'Компания';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Контактное лицо';
 $wb['username_txt'] = 'Логин';
 $wb['password_txt'] = 'Пароль';
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index 0e484473ad22360bd121968dddc1d557a32b100a..6f59c85f628958055176fb4ad457ae419233eaf7 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max antal spamfilteranvändare';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Förvald epostserver';
 $wb['company_name_txt'] = 'Företagsnamn';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kontaktnamn';
 $wb['username_txt'] = 'Användarnamn';
 $wb['password_txt'] = 'Lösenord';
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 5abb352a57b783d949b3c604672b42bb9c0d305c..7c482726150e9f0f89fc847c06d9df4366995b10 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contact name';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index 1bb9b0d03d439796714b0297729841857d3b7647..ec69f45f03adccc75ad5e4a9a12453763eabdb17 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. počet poUžívateľov Spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet Spamfilter politík';
 $wb['default_mailserver_txt'] = 'Predvolený Mailserver';
 $wb['company_name_txt'] = 'Názov firmy';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Meno kontaktnej osoby';
 $wb['username_txt'] = 'Užívateľské meno';
 $wb['password_txt'] = 'Heslo';
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 9aaf92076871a3d168c0c67df118950affb3733a..f76b7834dd8d58135f4f1b6d187602eb26b9f06b 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. počet poUžívateľov Spamfiltrov';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet Spamfilter politík';
 $wb['default_mailserver_txt'] = 'Predvolený Mailserver';
 $wb['company_name_txt'] = 'Názov firmy';
+$wb["contact_firstname_txt"] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Meno kontaktnej osoby';
 $wb['username_txt'] = 'Užívateľské meno';
 $wb['password_txt'] = 'Heslo';
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 4cc9d678b8fff3e401ac622cde9ff9c64e6d0cc4..3d0ce9407975749f421cac01fb50b0f02561f8d5 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. spam filtre kullanıcıları sayısı';
 $wb['limit_spamfilter_policy_txt'] = 'Max. spam filtre kuralı sayısı';
 $wb['default_mailserver_txt'] = 'Varsayılan Mail Sunucusu';
 $wb['company_name_txt'] = 'Şirket adı';
+$wb["contact_firstname_txt"] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kontak adı';
 $wb['username_txt'] = 'Kullanıcı adı';
 $wb['password_txt'] = 'Åžifre';
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index 2c2bebdf349af4b4562faa044f2a7b4f3eeeb41c..b19727cfe8474dc5663dac42252dfe9bd2cce011 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -13,6 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. spamfilter kullanıcıları';
 $wb['limit_spamfilter_policy_txt'] = 'Max. spamfilter policy sayısı';
 $wb['default_mailserver_txt'] = 'Varsayılan Mail Sunucusu';
 $wb['company_name_txt'] = 'Şirket adı';
+$wb["contact_firstname_txt"] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Kontak adı';
 $wb['username_txt'] = 'Kullanıcı adı';
 $wb['password_txt'] = 'Åžifre';
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index ea4b5911dee68dd38cbe2b46faf317a16c91144d..b3c5757cb3fd1d18348af5cff646a37ca9d84ba0 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -14,6 +14,10 @@
                 <select name="gender" id="gender" class="selectInput">
                     {tmpl_var name='gender'}
                 </select>
+            </div>
+			<div class="ctrlHolder">
+                <label for="contact_firstname">{tmpl_var name='contact_firstname_txt'}</label>
+                <input name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" size="30" maxlength="255" type="text" class="textInput" />
             </div>
             <div class="ctrlHolder">
                 <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index 4156254c4d158b980015b2a4329f46ab175d1573..41160cf5dc66cbefac38b7c1b15920104c70d497 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/reseller_edit_address.htm
@@ -14,6 +14,10 @@
                 <select name="gender" id="gender" class="selectInput">
                     {tmpl_var name='gender'}
                 </select>
+            </div>
+			<div class="ctrlHolder">
+                <label for="contact_firstname">{tmpl_var name='contact_firstname_txt'}</label>
+                <input name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" size="30" maxlength="255" type="text" class="textInput" />
             </div>
             <div class="ctrlHolder">
                 <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>