diff --git a/setup/check_install.php b/setup/check_install.php
index 9a7153faa8..9c610fcfd7 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -799,11 +799,11 @@ function jpgraph_check($name,array $args)
 		$jpgraph_path = dirname($egw_path);	// realpath can fail because eg. open_basedir does NOT include ..
 	}
 	$jpgraph_path .= SEP.'jpgraph';
-	
+
 	$min_version = isset($args['min_version']) ? $args['min_version'] : '1.13';
 
 	$available = false;
-	if (($check = file_exists($jpgraph_path) && is_dir($jpgraph_path)) && 
+	if (($check = file_exists($jpgraph_path) && is_dir($jpgraph_path)) &&
 		(file_exists($jpgraph_path.'/src/jpgraph.php') || file_exists($jpgraph_path.'/jpgraph.php')))
 	{
 		if (file_exists($jpgraph_path.'/VERSION') && preg_match('/Version: v([0-9.]+)/',file_get_contents($jpgraph_path.'/VERSION'),$matches))
@@ -820,14 +820,14 @@ function jpgraph_check($name,array $args)
 		' <span'.($available?'':' class="setup_warning"').'>'.
 		lang('Checking for JPGraph in %1',$jpgraph_path).': '.
 		(isset($version) ? lang('Version').' '.$version : lang('False'));
-		
+
 	if (!$available)
 	{
 		echo "<br />\n".lang('You dont have JPGraph version %1 or higher installed! It is needed from ProjectManager for Ganttcharts.',$min_version)."<br />\n";
 		echo lang('Please download a recent version from %1 and install it as %2.',
 			'<a href="http://jpgraph.net/download/" target="_blank">jpgraph.net/download/</a>',
 			$jpgraph_path);
-	}	
+	}
 	echo "</span></div>\n";
 
 	return $available;
@@ -876,7 +876,7 @@ if ($run_by_webserver)
 		echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n";
 		if(!$ConfigLang)
 		{
-			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.lang_select(True,'en')."</form></p>\n";
+			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True,'en')."</form></p>\n";
 		}
 		echo '<p>'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'</p>';
 		echo '<p>'.lang('We will now run a series of tests, which may take a few minutes.  Click the link below to proceed.').'</p>';
diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index 84c06f3054..add4062f51 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -210,7 +210,7 @@ class setup
 		{
 			return $ConfigLang;
 		}
-		return 'en';
+		return null;	// not returning 'en', as it suppresses the language selection in check_install and manageheader
 	}
 
 	/**
@@ -1064,7 +1064,7 @@ class setup
 			if ($primary_group)
 			{
 				vfs_home_hooks::addAccount($account);
-/*				
+/*
  				$GLOBALS['hook_values'] = $account + array('new_passwd' => $account['account_passwd']);
 				$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
 					'location' => 'addaccount'
@@ -1074,7 +1074,7 @@ class setup
 			else
 			{
 				vfs_home_hooks::addGroup($account+array('account_name' => $account['account_lid']));
-/*				
+/*
 				$GLOBALS['hook_values'] = $account+(array('account_name' => $account['account_lid']));
 				$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
 					'location' => 'addgroup'
diff --git a/setup/manageheader.php b/setup/manageheader.php
index 50fb9bb327..9ed1dcdb1e 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -168,7 +168,7 @@ function check_header_form()
 	// setting the domain settings from the posted content
 	foreach($_POST['domains'] as $key => $domain)
 	{
-		if ($_POST['deletedomain'][$key]) 
+		if ($_POST['deletedomain'][$key])
 		{
 			// Need to actually remove the domain.  Drop the DB manually.
 			unset($GLOBALS['egw_domain'][$domain]);
@@ -211,7 +211,7 @@ function show_header_form($validation_errors)
 
 	if(!get_var('ConfigLang',array('POST','COOKIE')))
 	{
-		$setup_tpl->set_var('lang_select','<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.lang_select(True,'en')."</form></td></tr>");
+		$setup_tpl->set_var('lang_select','<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.setup_html::lang_select(True,'en')."</form></td></tr>");
 	}
 
 	$setup_tpl->set_var('pagemsg',$GLOBALS['egw_info']['setup']['PageMSG']);