diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php
index 0053be26634e0b8e172d143c48b7eb7653b541de..7060fee2d383f9573cd1a431511d303e81600221 100644
--- a/interface/lib/classes/tform_actions.inc.php
+++ b/interface/lib/classes/tform_actions.inc.php
@@ -580,6 +580,10 @@ class tform_actions {
 
 		$this->dataRecord = $record;
 
+		if(isset($app->tform->formDef['record_name_field'])) {
+			$app->tform->formDef['title'] = $app->lng($app->tform->formDef['title']) . ' ' . $this->dataRecord[$app->tform->formDef['record_name_field']];
+		}
+
 		// Userdaten umwandeln
 		$record = $app->tform->getHTML($record, $this->active_tab, 'EDIT');
 		$record['id'] = $this->id;
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 3f51c209027d0d232d04e58d9abfec28c75c01fa..c373bf0a382c2704de62269ab4226d69259a5968 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -41,6 +41,7 @@
 $form["title"]   = "Client";
 $form["description"]    = "";
 $form["name"]   = "client";
+$form["record_name_field"] = "username";
 $form["action"]  = "client_edit.php";
 $form["db_table"] = "client";
 $form["db_table_idx"] = "client_id";
diff --git a/interface/web/client/form/domain.tform.php b/interface/web/client/form/domain.tform.php
index f521a55b2dac3b5b8f8c18628f4ffbd2b63aa047..c96af934d7ad993fec2dca7395482679adf0e89c 100644
--- a/interface/web/client/form/domain.tform.php
+++ b/interface/web/client/form/domain.tform.php
@@ -63,6 +63,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 $form["title"]    = "Domain";
 $form["description"]  = "";
 $form["name"]    = "domain";
+$form["record_name_field"] = "domain";
 $form["action"]   = "domain_edit.php";
 $form["db_table"]  = "domain";
 $form["db_table_idx"] = "domain_id";
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index d48dea62299ca28d4b82c3fc65c337dd87b693c9..c90b8f4a0aabd7c32f28ddb14c8864f08d1c678a 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -41,6 +41,7 @@
 $form["title"]    = "Reseller";
 $form["description"]  = "";
 $form["name"]    = "reseller";
+$form["record_name_field"] = "username";
 $form["action"]   = "reseller_edit.php";
 $form["db_table"]  = "client";
 $form["db_table_idx"] = "client_id";
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index 309a84236abc9dffa8b6943a3da54aeec5dae2ba..e17571e73612e8db511c303479aa3c87aed0ae8c 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -79,16 +79,6 @@ class page_action extends tform_actions {
 		parent::onShowNew();
 	}
 
-	function onShowEdit() {
-		global $app, $conf;
-
-		parent::onShowEdit();
-
-		if(isset($this->dataRecord)) {
-			$app->tform->formDef['title'] = $app->lng('DNS Zone') . ' ' . $this->dataRecord['origin'];
-		}
-	}
-
 	function onShowEnd() {
 		global $app, $conf;
 
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 7deb10945647a8ec40213ffa061e360ae8136efc..b9ec102d1ffb42cb1b2c6c7924a5e942fd015372 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -42,6 +42,7 @@ global $app;
 $form["title"]    = "DNS Zone";
 $form["description"]  = "";
 $form["name"]    = "dns_soa";
+$form["record_name_field"] = "origin";
 $form["action"]   = "dns_soa_edit.php";
 $form["db_table"]  = "dns_soa";
 $form["db_table_idx"] = "id";
diff --git a/interface/web/mail/form/mail_domain.tform.php b/interface/web/mail/form/mail_domain.tform.php
index 4a042abf2e354cf41f2e688862a234ba2f09e60b..7e105f97a129badf0b3fee211225cc20f93513e1 100644
--- a/interface/web/mail/form/mail_domain.tform.php
+++ b/interface/web/mail/form/mail_domain.tform.php
@@ -41,6 +41,7 @@
 $form["title"]    = "Mail Domain";
 $form["description"]  = "";
 $form["name"]    = "mail_domain";
+$form["record_name_field"] = "domain";
 $form["action"]   = "mail_domain_edit.php";
 $form["db_table"]  = "mail_domain";
 $form["db_table_idx"] = "domain_id";
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index d135e4f3de6c44a15c88d8257d2d9cf9dafbc26f..3dd334a29c6115f6db2bd59aaf5760b4c666959f 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -51,6 +51,7 @@ if(!$app->auth->is_admin()) {
 $form["title"]    = "Mailbox";
 $form["description"]  = "";
 $form["name"]    = "mail_user";
+$form["record_name_field"] = "email";
 $form["action"]   = "mail_user_edit.php";
 $form["db_table"]  = "mail_user";
 $form["db_table_idx"] = "mailuser_id";
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index e435f6ab96400086b5b0a81a0bae766fd829371e..975133fdc47037c50f2fe5a107341164ac40c1af 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -67,17 +67,6 @@ class page_action extends tform_actions {
 		parent::onShowNew();
 	}
 
-	function onShowEdit() {
-		global $app, $conf;
-
-		parent::onShowEdit();
-
-		if(isset($this->dataRecord)) {
-			$app->tform->formDef['title'] = $app->lng('Mailbox') . ' ' . $this->dataRecord['email'];
-		}
-	}
-
-
 	function onShowEnd() {
 		global $app, $conf;
 
diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
index dd3910c0434a850915aec7eeb5ede5201955d0a9..2d4785df99d116b20359fdf44b4ccd6eb3c39fdd 100644
--- a/interface/web/sites/form/database.tform.php
+++ b/interface/web/sites/form/database.tform.php
@@ -41,6 +41,7 @@
 $form["title"]    = "Database";
 $form["description"]  = "";
 $form["name"]    = "database";
+$form["record_name_field"] = "database_name";
 $form["action"]   = "database_edit.php";
 $form["db_table"]  = "web_database";
 $form["db_table_idx"] = "database_id";
diff --git a/interface/web/sites/form/database_user.tform.php b/interface/web/sites/form/database_user.tform.php
index 5f91cbd1f30a4617bdc702fd98cb21dfc8fa91c9..3c62fa42bbcdf2a23154d07cc5cd066bda8c5d4f 100644
--- a/interface/web/sites/form/database_user.tform.php
+++ b/interface/web/sites/form/database_user.tform.php
@@ -41,6 +41,7 @@
 $form["title"]    = "Database User";
 $form["description"]  = "";
 $form["name"]    = "database_user";
+$form["record_name_field"] = "database_user";
 $form["action"]   = "database_user_edit.php";
 $form["db_table"]  = "web_database_user";
 $form["db_table_idx"] = "database_user_id";
diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php
index e62f5ca40a548b5504cf89f98ce8e9ba752258c5..092fc016a173d72e1ea7a5a885d115c2a2012f83 100644
--- a/interface/web/sites/form/ftp_user.tform.php
+++ b/interface/web/sites/form/ftp_user.tform.php
@@ -41,6 +41,7 @@
 $form["title"]    = "FTP User";
 $form["description"]  = "";
 $form["name"]    = "ftp_user";
+$form["record_name_field"] = "username";
 $form["action"]   = "ftp_user_edit.php";
 $form["db_table"]  = "ftp_user";
 $form["db_table_idx"] = "ftp_user_id";
diff --git a/interface/web/sites/form/shell_user.tform.php b/interface/web/sites/form/shell_user.tform.php
index 523a03687aebee794ac6b91b915483e07ff02c21..d4230e1f0a591d01deb7f8bd72ba36a2ec82a56c 100644
--- a/interface/web/sites/form/shell_user.tform.php
+++ b/interface/web/sites/form/shell_user.tform.php
@@ -41,6 +41,7 @@
 $form["title"]    = "Shell User";
 $form["description"]  = "";
 $form["name"]    = "shell_user";
+$form["record_name_field"] = "username";
 $form["action"]   = "shell_user_edit.php";
 $form["db_table"]  = "shell_user";
 $form["db_table_idx"] = "shell_user_id";
diff --git a/interface/web/sites/form/web_childdomain.tform.php b/interface/web/sites/form/web_childdomain.tform.php
index 36718f5c9d4c5571cf2f904bb23be8d291dc2497..a8fe73ebc220849af8d976f0a1254e2f3923ed13 100644
--- a/interface/web/sites/form/web_childdomain.tform.php
+++ b/interface/web/sites/form/web_childdomain.tform.php
@@ -43,6 +43,7 @@ if(isset($_SESSION['s']['var']['childdomain_type']) && $_SESSION['s']['var']['ch
 $form["title"]    = ($childdomain_type == 'subdomain' ? "Subdomain" : 'Web Aliasdomain');
 $form["description"]  = "";
 $form["name"]    = "web_childdomain";
+$form["record_name_field"] = "domain";
 $form["action"]   = "web_childdomain_edit.php";
 $form["db_table"]  = "web_domain";
 $form["db_table_idx"] = "domain_id";
diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
index ba0d86f3eb892e1fdcf6e379b481198949847f97..c773df13343d95b288d55a14f81f6432d46c204e 100644
--- a/interface/web/sites/form/web_vhost_domain.tform.php
+++ b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -60,6 +60,7 @@ if(isset($_SESSION['s']['var']['vhostdomain_type'])) {
 $form["title"]    = $form_title;
 $form["description"]  = "";
 $form["name"]    = "web_vhost_domain";
+$form["record_name_field"] = "domain";
 $form["action"]   = "web_vhost_domain_edit.php";
 $form["db_table"]  = "web_domain";
 $form["db_table_idx"] = "domain_id";