diff --git a/phpgwapi/inc/class.setup_html.inc.php b/phpgwapi/inc/class.setup_html.inc.php
index 0e116ac215..708767b390 100644
--- a/phpgwapi/inc/class.setup_html.inc.php
+++ b/phpgwapi/inc/class.setup_html.inc.php
@@ -144,9 +144,17 @@
 			{
 				$GLOBALS['setup_tpl']->set_var('configdomain',' - ' . lang('Domain') . ': ' . $configdomain);
 			}
-			$GLOBALS['setup_tpl']->set_var('pgw_ver',@$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+
+			if(basename($_SERVER['SCRIPT_FILENAME']) != 'index.php')
+			{
+				$index_btn = '<a href="index.php" class="link">' . lang('Setup Main Menu') . '</a>';
+				$index_img = '<img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" />';
+				$GLOBALS['setup_tpl']->set_var('pgw_ver',@$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+			}
 			$GLOBALS['setup_tpl']->set_var(array(
-				'logoutbutton' => $btn_logout,
+				'logoutbutton'  => $btn_logout,
+				'indexbutton'   => $index_btn,
+				'indeximg'      => $index_img,
 				'check_install' => $check_install,
 				'main_menu'     => lang('Setup Main Menu'),
 				'user_login'    => lang('Back to user login')
diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl
index 3b4886335b..7487162788 100644
--- a/setup/templates/default/head.tpl
+++ b/setup/templates/default/head.tpl
@@ -102,6 +102,10 @@
 									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox">{check_install}</td>
 								</tr>
 
+								<tr class="divSideboxEntry">
+									<td width="20" align="center" valign="middle" class="textSidebox">{indeximg}</td><td class="textSidebox">{indexbutton}</td>
+								</tr>
+
 								<tr class="divSideboxEntry">
 									<td width="20" align="center" valign="middle" class="textSidebox"><img src="../phpgwapi/templates/idots/images/orange-ball.png" alt="ball" /></td><td class="textSidebox">{logoutbutton}</td>
 								</tr>