diff --git a/login.php b/login.php
index ea8089be09..e2167acb41 100755
--- a/login.php
+++ b/login.php
@@ -13,10 +13,10 @@
   /* $Id$ */
 
   $phpgw_flags = array("disable_message_class"    => True, "disable_send_class"     => True,
-			   "disable_nextmatchs_class" => True, "disable_template_class" => True,
-			   "login"					  => True, "currentapp"				=> "",
-			   "noheader"				  => True
-			  );
+			        "disable_nextmatchs_class" => True, "disable_template_class" => True,
+			        "login"				=> True, "currentapp"		    => "login",
+			        "noheader"				=> True
+			       );
 
   include("header.inc.php");
   include($phpgw_info["server"]["include_root"] . "/lang/" . "en" . "_login.inc.php");
diff --git a/logout.php b/logout.php
index 9f18acb178..49a575598f 100755
--- a/logout.php
+++ b/logout.php
@@ -16,11 +16,10 @@
   $phpgw_flags["disable_send_class"] = True;
   $phpgw_flags["disable_nextmatchs_class"] = True;
   $phpgw_flags["disable_template_class"] = True;
-  $phpgw_flags["currentapp"] = "";
+  $phpgw_flags["currentapp"] = "logout";
   $phpgw_flags["noheader"] = True;
 
   include("header.inc.php");
-//  include($phpgw_info["server"]["include_root"] . "/lang/en/" . "en" . "_logout.inc.php");
 
   $sep = $phpgw->common->filesystem_sepeartor();