diff --git a/setup/applications.php b/setup/applications.php
index 0a30158b94..ce2c6c9d4d 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -115,7 +115,7 @@
 
 	if(@get_var('submit',Array('POST')))
 	{
-		$GLOBALS['phpgw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['phpgw_setup']['ConfigDomain'] . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']['ConfigDomain']]['db_type'] . ')');
+		$GLOBALS['phpgw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 		$setup_tpl->set_var('description',lang('App install/remove/upgrade') . ':');
 		$setup_tpl->pparse('out','header');
 
@@ -236,7 +236,7 @@
 	}
 	else
 	{
-		$GLOBALS['phpgw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['phpgw_setup']['ConfigDomain'] . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']['ConfigDomain']]['db_type'] . ')');
+		$GLOBALS['phpgw_setup']->html->show_header(lang('Application Management'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 	}
 
 	$detail = get_var('detail',Array('GET'));
diff --git a/setup/config.php b/setup/config.php
index f57186e19b..ab83806617 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -152,7 +152,7 @@
 
 	if($newsettings['auth_type'] != 'ldap')
 	{
-		$GLOBALS['phpgw_setup']->html->show_header(lang('Configuration'),False,'config',$GLOBALS['phpgw_setup']['ConfigDomain'] . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']['ConfigDomain']]['db_type'] . ')');
+		$GLOBALS['phpgw_setup']->html->show_header(lang('Configuration'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 	}
 
 	@$GLOBALS['phpgw_setup']->db->query("SELECT * FROM $configtbl");
diff --git a/setup/lang.php b/setup/lang.php
index d77a9daca2..516b388599 100644
--- a/setup/lang.php
+++ b/setup/lang.php
@@ -103,7 +103,7 @@
 	$setup_tpl->set_var('lang_install',lang('install'));
 	$setup_tpl->set_var('lang_cancel',lang('cancel'));
 
-	$GLOBALS['phpgw_setup']->html->show_header("$stage_title",False,'config',$GLOBALS['phpgw_setup']['ConfigDomain'] . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']['ConfigDomain']]['db_type'] . ')');
+	$GLOBALS['phpgw_setup']->html->show_header("$stage_title",False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 	$setup_tpl->pparse('out','T_lang_main');
 	$GLOBALS['phpgw_setup']->html->show_footer();
 ?>
diff --git a/setup/ldap.php b/setup/ldap.php
index 6d32ddaced..58ddc877e1 100644
--- a/setup/ldap.php
+++ b/setup/ldap.php
@@ -43,7 +43,7 @@
 		'T_alert_msg' => 'msg_alert_msg.tpl'
 	));
 
-	$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP Config'),'','config',$GLOBALS['phpgw_setup']['ConfigDomain']);
+	$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP Config'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 
 	if ($GLOBALS['error'])
 	{
diff --git a/setup/ldapexport.php b/setup/ldapexport.php
index f5f0bcd65c..7ebdc469ce 100644
--- a/setup/ldapexport.php
+++ b/setup/ldapexport.php
@@ -230,7 +230,7 @@
 		$setup_complete = True;
 	}
 
-	$GLOBALS['phpgw_setup']->html->show_header('LDAP Export','','config',$GLOBALS['phpgw_setup']['ConfigDomain']);
+	$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP Export'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 
 	if($error)
 	{
diff --git a/setup/ldapimport.php b/setup/ldapimport.php
index b9fb2d5406..ae2161fbed 100644
--- a/setup/ldapimport.php
+++ b/setup/ldapimport.php
@@ -395,7 +395,7 @@
 		$setup_complete = True;
 	}
 
-	$GLOBALS['phpgw_setup']->html->show_header('LDAP Import','','config',$GLOBALS['phpgw_setup']['ConfigDomain']);
+	$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP Import'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 
 	if ($error)
 	{
diff --git a/setup/ldapmodify.php b/setup/ldapmodify.php
index e3ddcf3acd..5d7072eda3 100644
--- a/setup/ldapmodify.php
+++ b/setup/ldapmodify.php
@@ -123,7 +123,7 @@
 		exit;
 	}
 
-	$GLOBALS['phpgw_setup']->html->show_header('LDAP Modify','','config',$GLOBALS['phpgw_setup']['ConfigDomain']);
+	$GLOBALS['phpgw_setup']->html->show_header(lang('LDAP Modify'),False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 	$setup_complete = False;
 	if (isset($_POST['submit']))
 	{
diff --git a/setup/system_charset.php b/setup/system_charset.php
index 4d793fc03a..f031a1c5b1 100644
--- a/setup/system_charset.php
+++ b/setup/system_charset.php
@@ -48,14 +48,14 @@
 
 	if ($diagnostics || !@$_POST['convert'])
 	{
-		$GLOBALS['phpgw_setup']->html->show_header($stage_title,False,'config',$GLOBALS['phpgw_setup']['ConfigDomain'] . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']['ConfigDomain']]['db_type'] . ')');
+		$GLOBALS['phpgw_setup']->html->show_header($stage_title,False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 	}
 	if (@$_POST['convert'])
 	{
 		if (empty($_POST['current_charset']))
 		{
 			$errors[] = lang('You need to select your current charset!');
-			$GLOBALS['phpgw_setup']->html->show_header($stage_title,False,'config',$GLOBALS['phpgw_setup']['ConfigDomain'] . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']['ConfigDomain']]['db_type'] . ')');
+			$GLOBALS['phpgw_setup']->html->show_header($stage_title,False,'config',$GLOBALS['phpgw_setup']->ConfigDomain . '(' . $phpgw_domain[$GLOBALS['phpgw_setup']->ConfigDomain]['db_type'] . ')');
 		}
 		else
 		{