diff --git a/home/setup/setup.inc.php b/home/setup/setup.inc.php
index ffe53a0e03..b142ff80a5 100755
--- a/home/setup/setup.inc.php
+++ b/home/setup/setup.inc.php
@@ -18,7 +18,7 @@
 	$setup_info['home']['app_order'] = 1;
 	$setup_info['home']['enable']    = 1;
 
-	$setup_info['home']['author'] = 'Edo van Bruggen';
+	$setup_info['home']['author'] = 'eGroupWare Core Team';
 	$setup_info['home']['license']  = 'GPL';
 	$setup_info['home']['description'] = 'Displays eGroupWare\' homepage';
 	$setup_info['home']['maintainer'] = array(
diff --git a/index.php b/index.php
index dc008b309f..754de0e664 100755
--- a/index.php
+++ b/index.php
@@ -90,13 +90,21 @@
 		}
 		if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
 		{
-			$GLOBALS['egw']->redirect_link('/'.$GLOBALS['egw_info']['user']['preferences']['common']['default_app'].'/index.php');
+		   /** Test if our default app is available else open about.php */
+		   if(is_file('./'.$GLOBALS['egw_info']['user']['preferences']['common']['default_app'].'/index.php'))
+		   {
+			  $GLOBALS['egw']->redirect_link('/'.$GLOBALS['egw_info']['user']['preferences']['common']['default_app'].'/index.php');
+		   }
+		   else
+		   {
+			  $GLOBALS['egw']->redirect_link('/about.php');
+		   }
 		}
 		else
 		{
-			$GLOBALS['egw']->redirect_link('/home/index.php');
+		   $GLOBALS['egw']->redirect_link('/home/index.php');
 		}
-	}
+	 }
 
 	if($windowed && $_GET['cd'] == 'yes')
 	{