diff --git a/admin_clients.php b/admin_clients.php
index e1b78f03..5af0f787 100644
--- a/admin_clients.php
+++ b/admin_clients.php
@@ -193,8 +193,23 @@ if((int)$settings['multiserver']['enabled'] == 1)
 			 *   what settings are going to be shown here 
 			 *   (parameter $client_settings, has to be an array,
 			 *   see loadConfigArrayDir-function)
+			 * 
+			 *   now set are all possible client settings
 			 */
-			$client_settings = array('froxlorclient');
+			$client_settings = array(
+				'froxlorclient',
+				'webserver',
+				'ssl',
+				'fcgid',
+				'perl',
+				'statistics',
+				'mail',
+				'ftpserver',
+				'nameserver',
+				'logging',
+				'dkim',
+				'spf'
+			);
 
 			$settings_data = loadConfigArrayDir(
 				'./actions/admin/settings/',
diff --git a/templates/admin/froxlorclients/froxlorclient_settings.tpl b/templates/admin/froxlorclients/froxlorclient_settings.tpl
index d0e606cd..7b167585 100644
--- a/templates/admin/froxlorclients/froxlorclient_settings.tpl
+++ b/templates/admin/froxlorclients/froxlorclient_settings.tpl
@@ -1,6 +1,6 @@
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}</b>
+				<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}"</b>
 				[<a href="$filename?page=clients&amp;action=settings&amp;part=&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['compactoverview']}</a>]</td>
 			</tr>
 			$fields
diff --git a/templates/admin/froxlorclients/froxlorclient_settingsoverview.tpl b/templates/admin/froxlorclients/froxlorclient_settingsoverview.tpl
index 4fa09dcb..540f5550 100644
--- a/templates/admin/froxlorclients/froxlorclient_settingsoverview.tpl
+++ b/templates/admin/froxlorclients/froxlorclient_settingsoverview.tpl
@@ -1,7 +1,7 @@
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
 				<td class="maintitle" align="center" colspan="3">
-					<b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b>
+					<b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}&nbsp;"{$client->Get('name')}"</b>
 					[<a href="$filename?page=clients&amp;action=settings&amp;part=all&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['overview']}</a>]
 				</td>
 			</tr>