diff --git a/interface/web/client/list/client_template.list.php b/interface/web/client/list/client_template.list.php
index a63776ff88d5394298bd745d61c9ecccbf6a2ca3..8a27e82a4b198b0972babffffdadb74d6e1338d6 100644
--- a/interface/web/client/list/client_template.list.php
+++ b/interface/web/client/list/client_template.list.php
@@ -52,7 +52,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 		'prefix' => '',
 		'suffix' => '',
 		'datasource' => array (  'type' => 'SQL',
-			'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
+			'querystring' => "SELECT sys_group.groupid, {CLIENTNAMESQL} as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
 			'keyfield'=> 'groupid',
 			'valuefield'=> 'name'
 		),
diff --git a/interface/web/client/list/domain.list.php b/interface/web/client/list/domain.list.php
index 8fc81eeef9f40e5175c0ca802cdf8e8b9958181c..d05dc5b6ff0375233fe54b772f2dd5547c4f243c 100644
--- a/interface/web/client/list/domain.list.php
+++ b/interface/web/client/list/domain.list.php
@@ -93,7 +93,7 @@ $liste["item"][] = array( 'field'  => "sys_groupid",
 	'suffix' => "",
 	'datasource' => array (  'type' => 'SQL',
 		//'querystring' => 'SELECT a.groupid, a.name FROM sys_group a, domain b WHERE (a.groupid = b.sys_groupid) AND ({AUTHSQL-B}) ORDER BY name',
-		'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id AND {AUTHSQL} ORDER BY client.company_name, client.contact_name",
+		'querystring' => "SELECT sys_group.groupid, {CLIENTNAMESQL} as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id AND {AUTHSQL} ORDER BY client.company_name, client.contact_name",
 		'keyfield'=> 'groupid',
 		'valuefield'=> 'name'
 	),
diff --git a/interface/web/dns/list/dns_slave.list.php b/interface/web/dns/list/dns_slave.list.php
index de0fd3a211191fc3c7e8f00446d5de7e49e9dc7c..bd32b6a4078c01e8f6a1e754da98dc60617860c6 100644
--- a/interface/web/dns/list/dns_slave.list.php
+++ b/interface/web/dns/list/dns_slave.list.php
@@ -84,7 +84,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 		'suffix' => "",
 		'datasource' => array (  'type' => 'SQL',
 			//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
-			'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
+			'querystring' => "SELECT sys_group.groupid, {CLIENTNAMESQL} as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
 			'keyfield'=> 'groupid',
 			'valuefield'=> 'name'
 		),
diff --git a/interface/web/mail/list/mail_domain.list.php b/interface/web/mail/list/mail_domain.list.php
index 5304ab622665fee3f185ed303cc033953cafb712..e2a7b015c170d437df4c789bb18d8add38743886 100644
--- a/interface/web/mail/list/mail_domain.list.php
+++ b/interface/web/mail/list/mail_domain.list.php
@@ -71,7 +71,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 		'suffix' => "",
 		'datasource' => array (  'type' => 'SQL',
 			//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
-			'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
+			'querystring' => "SELECT sys_group.groupid, {CLIENTNAMESQL} as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
 			'keyfield'=> 'groupid',
 			'valuefield'=> 'name'
 		),
diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php
index 25e1b8de7f3811e6ef3a7bc51a1d459c445b572e..6ecaa7e07eebe1d44a467932ab32570c4aac0e0f 100644
--- a/interface/web/sites/list/database.list.php
+++ b/interface/web/sites/list/database.list.php
@@ -92,7 +92,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 		'suffix' => "",
 		'datasource' => array (  'type' => 'SQL',
 			//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
-			'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
+			'querystring' => "SELECT sys_group.groupid, {CLIENTNAMESQL} as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
 			'keyfield'=> 'groupid',
 			'valuefield'=> 'name'
 		),
diff --git a/interface/web/sites/list/database_user.list.php b/interface/web/sites/list/database_user.list.php
index dd25d03349dbc36c0cd9b32d331159bc73c97d29..f8935d33ec2153af1396c665e8c5c81a8fd9a354 100644
--- a/interface/web/sites/list/database_user.list.php
+++ b/interface/web/sites/list/database_user.list.php
@@ -61,7 +61,7 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 		'suffix' => "",
 		'datasource' => array (  'type' => 'SQL',
 			//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
-			'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
+			'querystring' => "SELECT sys_group.groupid, {CLIENTNAMESQL} as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
 			'keyfield'=> 'groupid',
 			'valuefield'=> 'name'
 		),