diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index 8473efc9a6..d620b653a0 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -40,7 +40,7 @@ init_userprefs($userdata);
 //
 if( !$userdata['session_logged_in'] )
 {
-	header("Location: ../login.$phpEx?forward_page=/admin/");
+	header("Location: ../login.$phpEx?forward_page=admin/");
 }
 else if( $userdata['user_level'] != ADMIN )
 {
@@ -66,7 +66,7 @@ if( $HTTP_GET_VARS['pane'] == 'left' )
 	include('page_header_admin.'.$phpEx);
 
 	$template->set_filenames(array(
-		"body" => "admin/navigate.tpl")
+		"body" => "admin/index_navigate.tpl")
 	);
 	
 	$template->assign_vars(array(
@@ -104,6 +104,7 @@ if( $HTTP_GET_VARS['pane'] == 'left' )
 	$template->pparse("body");
 
 	unset($setmodules);
+	exit;
 }
 elseif( $HTTP_GET_VARS['pane'] == 'right' )
 {
@@ -111,7 +112,7 @@ elseif( $HTTP_GET_VARS['pane'] == 'right' )
 	include('page_header_admin.'.$phpEx);
 	
 	$template->set_filenames(array(
-		"body" => "admin/admin_index_body.tpl")
+		"body" => "admin/index_body.tpl")
 	);
 
 	$template->assign_vars(array(
diff --git a/phpBB/templates/PSO/admin/index_navigate.tpl b/phpBB/templates/PSO/admin/index_navigate.tpl
new file mode 100644
index 0000000000..56e9a4a527
--- /dev/null
+++ b/phpBB/templates/PSO/admin/index_navigate.tpl
@@ -0,0 +1,22 @@
+
+<a href="{U_BOARD_INDEX}" target="_top"><img src="../images/logo_medium.gif" border="0"/></a>
+<!-- <div align="center"><font face="Impact,sans-serif" size="6"><a href="{U_BOARD_INDEX}" target="_top">phpBB2</a></font></div> -->
+
+<table width="100%" cellpadding="4" cellspacing="0" border="0" align="center">
+	<tr>
+		<td ><a href="{U_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a></td>
+	</tr>
+	<!-- BEGIN catrow -->
+	<tr>
+		<td class="cat" align="center"><span class="cattitle"><b>{catrow.CATNAME}</b></span></td>
+	</tr>
+	<!-- BEGIN actionrow -->
+	<tr>
+		<td><a href="{catrow.actionrow.FILE}"  target="main">{catrow.actionrow.ACTIONNAME}</a></td>
+	</tr>
+	<!-- END actionrow -->
+	<!-- END catrow -->
+</table>
+
+</body>
+</html>
\ No newline at end of file