diff --git a/home.php b/home.php
index 88298e85ad..33cb88ece5 100755
--- a/home.php
+++ b/home.php
@@ -1,23 +1,25 @@
 <?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * The file written by Joseph Engo <jengo@phpgroupware.org>                 *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* phpGroupWare                                                             *
+	* http://www.phpgroupware.org                                              *
+	* The file written by Joseph Engo <jengo@phpgroupware.org>                 *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-  /* $Id$ */
+	/* $Id$ */
 
+	$phpgw_info = array();
 	if (!is_file('header.inc.php'))
 	{
 		echo '<center>It appears that phpGroupWare is not setup yet, please click <a href="setup/index.php">'
 			. 'here</a>.</center>';
 		exit;
 	}
+
 	$GLOBALS['sessionid'] = $GLOBALS['HTTP_GET_VARS']['sessionid'] ? $GLOBALS['HTTP_GET_VARS']['sessionid'] : $GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
 	if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
 	{
diff --git a/index.php b/index.php
index b164ecd7e0..80ebcae490 100755
--- a/index.php
+++ b/index.php
@@ -11,6 +11,7 @@
 
 	/* $Id$ */
 
+	$phpgw_info = array();
 	$GLOBALS['sessionid'] = @$GLOBALS['HTTP_GET_VARS']['sessionid'] ? @$GLOBALS['HTTP_GET_VARS']['sessionid'] : @$GLOBALS['HTTP_COOKIE_VARS']['sessionid'];
 	if (! $GLOBALS['sessionid'])
 	{
diff --git a/login.php b/login.php
index 1d6c11300e..a84431c48b 100755
--- a/login.php
+++ b/login.php
@@ -13,6 +13,7 @@
 
 	/* $Id$ */
 
+	$phpgw_info = array();
 	$GLOBALS['phpgw_info']['flags'] = array(
 		'disable_template_class' => True,
 		'login'                  => True,
@@ -144,8 +145,8 @@
 		unset($sslattributes);
 	}
 
-	if (isset($HTTP_POST_VARS['submitit']) && $HTTP_POST_VARS['submitit'] || $submit_x || $submit_y ||
-		 isset($HTTP_POST_VARS['passwd']) && $HTTP_POST_VARS['passwd']) // enable konqueror to login via Return
+	if (isset($HTTP_POST_VARS['passwd_type']) || $submit_x || $submit_y)
+//		 isset($HTTP_POST_VARS['passwd']) && $HTTP_POST_VARS['passwd']) // enable konqueror to login via Return
 	{
 		if (getenv(REQUEST_METHOD) != 'POST' && !isset($PHP_AUTH_USER) && !isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN']))
 		{