diff --git a/login.php b/login.php
index 294d1b7209..1d6c11300e 100755
--- a/login.php
+++ b/login.php
@@ -13,7 +13,7 @@
 
 	/* $Id$ */
 
-	$phpgw_info['flags'] = array(
+	$GLOBALS['phpgw_info']['flags'] = array(
 		'disable_template_class' => True,
 		'login'                  => True,
 		'currentapp'             => 'login',
@@ -21,11 +21,11 @@
 	);
 	include('./header.inc.php');
 
-	$phpgw_info['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $phpgw_info['login_template_set'];
-	$tmpl = CreateObject('phpgwapi.Template', $phpgw_info['server']['template_dir']);
+	$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'];
+	$tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']);
 
 	// This is used for system downtime, to prevent new logins.
-	if ($phpgw_info['server']['deny_all_logins'])
+	if ($GLOBALS['phpgw_info']['server']['deny_all_logins'])
 	{
 		$tmpl->set_file(array(
 			'login_form'  => 'login_denylogin.tpl'
@@ -40,7 +40,7 @@
 	// If there is a problem, tell me and I will fix it. (jengo)
 
 /*
-	if ($code != 10 && $phpgw_info['server']['usecookies'] == False)
+	if ($code != 10 && $GLOBALS['phpgw_info']['server']['usecookies'] == False)
 	{
 		Setcookie('sessionid');
 		Setcookie('kp3');
@@ -58,12 +58,12 @@
 	}
 */
 
-	if (! $deny_login && ! $phpgw_info['server']['show_domain_selectbox'])
+	if (! $deny_login && ! $GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
 	{
 		$tmpl->set_file(array('login_form'  => 'login.tpl'));
 		$tmpl->set_var('charset',lang('charset'));
 	}
-	else if ($phpgw_info['server']['show_domain_selectbox'])
+	elseif ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
 	{
 		$tmpl->set_file(array('login_form'  => 'login_selectdomain.tpl'));
 		$tmpl->set_var('charset',lang('charset'));
@@ -71,9 +71,9 @@
 
 	function show_cookie()
 	{
-		global $phpgw_info, $code, $last_loginid, $login;
+		global $code, $last_loginid, $login;
 		/* This needs to be this way, because if someone doesnt want to use cookies, we shouldnt sneak one in */
-		if ($code != 5 && (isset($phpgw_info['server']['usecookies']) && $phpgw_info['server']['usecookies']))
+		if ($code != 5 && (isset($GLOBALS['phpgw_info']['server']['usecookies']) && $GLOBALS['phpgw_info']['server']['usecookies']))
 		{
 			return $last_loginid;
 		}
@@ -81,7 +81,6 @@
 
 	function check_logoutcode($code)
 	{
-		global $phpgw_info;
 		switch($code)
 		{
 			case 1:
@@ -106,7 +105,7 @@
 
 	/* Program starts here */
   
-	if ($phpgw_info['server']['auth_type'] == 'http' && isset($PHP_AUTH_USER))
+	if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($PHP_AUTH_USER))
 	{
 		$submit = True;
 		$login  = $PHP_AUTH_USER;
@@ -115,7 +114,7 @@
 
 	# Apache + mod_ssl style SSL certificate authentication
 	# Certificate (chain) verification occurs inside mod_ssl
-	if ($phpgw_info['server']['auth_type'] == 'sqlssl' && isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN']) && !isset($cd))
+	if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'sqlssl' && isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN']) && !isset($cd))
 	{
 		# an X.509 subject looks like:
 		# /CN=john.doe/OU=Department/O=Company/C=xx/Email=john@comapy.tld/L=City/
@@ -156,7 +155,7 @@
 
 		if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
 		{
-			$GLOBALS['phpgw']->redirect($phpgw_info['server']['webserver_url'] . '/login.php?cd=5');
+			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=5');
 		}
 		else
 		{
@@ -191,7 +190,7 @@
 			{
 				$GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository();
 			}
-			#print 'LANG:' . $phpgw_info['user']['preferences']['common']['lang'] . '<br>';
+			#print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
 			$GLOBALS['phpgw']->translation->add_app('login');
 			$GLOBALS['phpgw']->translation->add_app('loginscreen');
 			if (lang('loginscreen_message') != 'loginscreen_message*')
@@ -247,17 +246,17 @@
 		$extra_vars = '?' . substr($extra_vars,1,strlen($extra_vars));
 	}
 
-	$tmpl->set_var('login_url', $phpgw_info['server']['webserver_url'] . '/login.php' . $extra_vars);
-	$tmpl->set_var('registration_url',$phpgw_info['server']['webserver_url'] . '/registration/');
-	$tmpl->set_var('website_title', $phpgw_info['server']['site_title']);
+	$tmpl->set_var('login_url', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+	$tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url'] . '/registration/');
+	$tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);
 	$tmpl->set_var('cd',check_logoutcode($cd));
 	$tmpl->set_var('cookie',show_cookie());
 	$tmpl->set_var('lang_username',lang('username'));
 	$tmpl->set_var('lang_phpgw_login',lang('phpGroupWare login'));
-	$tmpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
+	$tmpl->set_var('version',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
 	$tmpl->set_var('lang_password',lang('password'));
 	$tmpl->set_var('lang_login',lang('login'));
-	$tmpl->set_var('template_set',$phpgw_info['login_template_set']);
+	$tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
 
 	$tmpl->pfp('loginout','login_form');
 ?>