diff --git a/home.php b/home.php
index 48d3d156dd..147c67dc00 100755
--- a/home.php
+++ b/home.php
@@ -34,19 +34,14 @@
 		'enable_nextmatchs_class' => True
 	);
 	include('header.inc.php');
-	// Note: I need to add checks to make sure these apps are installed.
 
 	if ($phpgw_forward)
 	{
-		// Why again?
-		if ($phpgw_forward)
+		while (list($name,$value) = each($HTTP_GET_VARS))
 		{
-			while (list($name,$value) = each($HTTP_GET_VARS))
+			if (ereg('phpgw_',$name))
 			{
-				if (ereg('phpgw_',$name))
-				{
-					$extra_vars .= '&' . $name . '=' . urlencode($value);
-				}
+				$extra_vars .= '&' . $name . '=' . urlencode($value);
 			}
 		}
 		$phpgw->redirect($phpgw->link($phpgw_forward,$extra_vars));
@@ -114,12 +109,6 @@
 			echo parse_navbar();
 		}
 
-		// $phpgw->hooks->proccess("location","mainscreen");
-		// $phpgw->preferences->read_preferences("addressbook");
-		// $phpgw->preferences->read_preferences("email");
-		// $phpgw->preferences->read_preferences("calendar");
-		// $phpgw->preferences->read_preferences("stocks");
-
 		$phpgw->db->query("select app_version from phpgw_applications where app_name='phpgwapi'",__LINE__,__FILE__);
 		if($phpgw->db->next_record())
 		{
diff --git a/login.php b/login.php
index fea4db298c..7f5b9968d2 100755
--- a/login.php
+++ b/login.php
@@ -168,7 +168,7 @@
 					}
 				}
 			}
-			$phpgw->redirect($phpgw->link('/index.php','cd=yes' . $extra_vars));
+			$phpgw->redirect($phpgw->link('/home.php','cd=yes' . $extra_vars));
 		}
 	}
 	else