diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 83a97e3d69..4897cd2c53 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -13,6 +13,7 @@ $setup_info['calendar']['name']    = 'calendar';
 $setup_info['calendar']['version'] = '1.6';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
+$setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index';
 
 $setup_info['calendar']['license']  = 'GPL';
 $setup_info['calendar']['description'] =
diff --git a/etemplate/setup/setup.inc.php b/etemplate/setup/setup.inc.php
index 8ff4e0ee17..2ae9ba9384 100644
--- a/etemplate/setup/setup.inc.php
+++ b/etemplate/setup/setup.inc.php
@@ -16,6 +16,7 @@ $setup_info['etemplate']['version']   = '1.6';
 $setup_info['etemplate']['app_order'] = 60;	// just behind the developers-tools
 $setup_info['etemplate']['tables']    = array('egw_etemplate');
 $setup_info['etemplate']['enable']    = 1;
+$setup_info['etemplate']['index']     = 'etemplate.editor.edit';
 
 $setup_info['etemplate']['author'] =
 	$setup_info['etemplate']['maintainer'] = array(
diff --git a/filemanager/setup/setup.inc.php b/filemanager/setup/setup.inc.php
index eab7667cce..08b7ea0064 100755
--- a/filemanager/setup/setup.inc.php
+++ b/filemanager/setup/setup.inc.php
@@ -13,6 +13,7 @@ $setup_info['filemanager']['title']   = 'Filemanager';
 $setup_info['filemanager']['version'] = '1.6';
 $setup_info['filemanager']['app_order'] = 6;
 $setup_info['filemanager']['enable']  = 1;
+$setup_info['filemanager']['index']   = 'filemanager.filemanager_ui.index';
 
 $setup_info['infolog']['author'] =
 $setup_info['infolog']['maintainer'] = array(
diff --git a/resources/index.php b/resources/index.php
index 8e44877df8..01fb88e75f 100755
--- a/resources/index.php
+++ b/resources/index.php
@@ -1,21 +1,14 @@
 <?php
-	/**
-	 * eGroupWare - resources
-	 * http://www.egroupware.org 
-	 *
-	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-	 * @package resources
-	 * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
-	 * @author Lukas Weiss <wnz_gh05t@users.sourceforge.net>
-	 * @version $Id$
-	 */
-	
-	$GLOBALS['egw_info']['flags'] = array(
-		'currentapp'	=> 'resources',
-		'noheader'	=> True,
-		'nonavbar'	=> True
-	);
-	include('../header.inc.php');
+/**
+ * eGroupWare - resources
+ * http://www.egroupware.org
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package resources
+ * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
+ * @author Lukas Weiss <wnz_gh05t@users.sourceforge.net>
+ * @version $Id$
+ */
 
-	$GLOBALS['egw']->redirect_link('/index.php','menuaction=resources.ui_resources.index');
-	
\ No newline at end of file
+header('Location: ../index.php?menuaction=resources.ui_resources.index'.
+	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php
index 92d2235f84..5c80b2f808 100755
--- a/resources/setup/setup.inc.php
+++ b/resources/setup/setup.inc.php
@@ -17,6 +17,7 @@ $setup_info['resources']['version']	= '1.6';
 $setup_info['resources']['app_order']	= 5;
 $setup_info['resources']['tables']	= array('egw_resources','egw_resources_extra');
 $setup_info['resources']['enable']	= 1;
+$setup_info['resources']['index']	= 'resources.ui_resources.index';
 
 $setup_info['resources']['author']	= 'Cornelius Weiss';
 $setup_info['resources']['license']	= 'GPL';