Index: trunk/admin/index.php
===================================================================
diff -u -r898 -r922
--- trunk/admin/index.php	(.../index.php)	(revision 898)
+++ trunk/admin/index.php	(.../index.php)	(revision 922)
@@ -95,7 +95,9 @@
 $cssURL = $adminURL."/include";
 
 
-if (!admin_login())
+// !admin_login() - admin, but not logged in
+
+if (!admin_login() || GetVar('logout') || GetVar('expired') )
 {            
     if(!headers_sent())
       setcookie("sid"," ",time()-3600);
Index: trunk/kernel/action.php
===================================================================
diff -u -r921 -r922
--- trunk/kernel/action.php	(.../action.php)	(revision 921)
+++ trunk/kernel/action.php	(.../action.php)	(revision 922)
@@ -24,7 +24,7 @@
     if(!headers_sent())
       setcookie("sid"," ",time()-3600);
     $objSession->Logout();
-    header("Location: ".$adminURL."/login.php?expired=1");
+    header("Location: ".$adminURL.'/login.php?env='.BuildEnv().'&expired=1');
     die();
 	//require_once($pathtoroot."admin/login.php");
 }
Index: trunk/admin/head.php
===================================================================
diff -u -r898 -r922
--- trunk/admin/head.php	(.../head.php)	(revision 898)
+++ trunk/admin/head.php	(.../head.php)	(revision 922)
@@ -113,7 +113,7 @@
   			<td align="right" background="images/version_bg.gif" class="head_version" valign="bottom"><img alt="" src="images/spacer.gif" width="1" height="10"  align="absmiddle">
 
   	<?php echo prompt_language("la_Logged_in_as")." "; ?><B><?php echo $loginname." "; ?></B>
-  	<a href="<?php echo $logout."login.php?logout=1"; ?>" target="_parent"><img src="images/blue_bar_logout.gif" height="16" WIDTH="16" align="absmiddle" BORDER="0"></A></td>
+  	<a href="<?php echo $logout.'index.php?env='.BuildEnv().'&logout=1'; ?>" target="_parent"><img src="images/blue_bar_logout.gif" height="16" WIDTH="16" align="absmiddle" BORDER="0"></A></td>
 		</tr>
 		<tr>
 			<td><img alt="" src="images/blocks2.gif" width="400" height="1"></td>