diff --git a/phpgwapi/inc/phpgw.inc.php b/phpgwapi/inc/phpgw.inc.php
index 6a6d0c8287..8616879799 100644
--- a/phpgwapi/inc/phpgw.inc.php
+++ b/phpgwapi/inc/phpgw.inc.php
@@ -169,20 +169,20 @@
          }
       }
 
-      /* Load selected authentication class */
-      if (empty($phpgw_info["server"]["auth_type"])){$phpgw_info["server"]["auth_type"] = "sql";}
-      include($phpgw_info["server"]["api_inc"] . "/phpgw_auth_".$phpgw_info["server"]["auth_type"].".inc.php");
- 
-      /* Load selected accounts class */
-      if (empty($phpgw_info["server"]["account_repository"])){$phpgw_info["server"]["account_repository"] = $phpgw_info["server"]["auth_type"];}
-      include($phpgw_info["server"]["api_inc"] . "/phpgw_accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
-      include($phpgw_info["server"]["api_inc"] . "/phpgw_accounts_shared.inc.php");
-  
       /**************************************************************************\
       * Continue adding the classes                                              *
       \**************************************************************************/
-      $this->auth          = new auth;
-      $this->session       = new sessions;
+      if ($phpgw_info["flags"]["currentapp"] != "login" && $phpgw_info["flags"]["currentapp"] != "logout") {
+        $this->session       = new sessions;
+        if (! $this->session->verify()) {
+          Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/login.php", "cd=10"));
+          exit;
+        }
+        $this->auth          = new auth;
+      }else{
+        $this->auth          = new auth;
+        $this->session       = new sessions;
+      }
       $this->translation   = new translation;
       $this->common        = new common;
       $this->accounts      = new accounts;
@@ -190,18 +190,21 @@
       $this->acl           = new acl;
       $this->hooks         = new hooks;
 
+      /* Load selected authentication class */
+      if (empty($phpgw_info["server"]["auth_type"])){$phpgw_info["server"]["auth_type"] = "sql";}
+      include($phpgw_info["server"]["api_inc"] . "/phpgw_auth_".$phpgw_info["server"]["auth_type"].".inc.php");
+   
+      /* Load selected accounts class */
+      if (empty($phpgw_info["server"]["account_repository"])){$phpgw_info["server"]["account_repository"] = $phpgw_info["server"]["auth_type"];}
+      include($phpgw_info["server"]["api_inc"] . "/phpgw_accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
+      include($phpgw_info["server"]["api_inc"] . "/phpgw_accounts_shared.inc.php");
+
       $sep = filesystem_separator();
       $template_root = $this->common->get_tpl_dir();
 
       if (is_dir($template_root)) {          
          $this->template = new Template($template_root);
       }
-      if ($phpgw_info["flags"]["currentapp"] != "login" && $phpgw_info["flags"]["currentapp"] != "logout") {
-        if (! $this->session->verify()) {
-          Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/login.php", "cd=10"));
-          exit;
-        }
-      }
     } 
     /**************************************************************************\
     * Core functions                                                           *