diff --git a/html/includes/authenticate.inc.php b/html/includes/authenticate.inc.php
index fa014a24eb..c45c95ddb9 100644
--- a/html/includes/authenticate.inc.php
+++ b/html/includes/authenticate.inc.php
@@ -60,18 +60,9 @@ else
 
 $auth_success = 0;
 
-if (isset($_SESSION['username']) or ($config['auth_mechanism'] == 'http-auth' and !isset($_GET['logout'])))
+if (isset($_SESSION['username']))
 {
-  if($config['auth_mechanism'] == 'http-auth')
-  {
-    $authenticateResult = authenticate(false,false);
-  }
-  else
-  {
-    $authenticateResult = authenticate($_SESSION['username'],$_SESSION['password']);
-  }
-  
-  if ($authenticateResult)
+  if (authenticate($_SESSION['username'],$_SESSION['password']))
   {
     $_SESSION['userlevel'] = get_userlevel($_SESSION['username']);
     $_SESSION['user_id'] = get_userid($_SESSION['username']);
diff --git a/html/includes/authentication/http-auth.inc.php b/html/includes/authentication/http-auth.inc.php
index 0fb2334bbd..e74fd8a554 100644
--- a/html/includes/authentication/http-auth.inc.php
+++ b/html/includes/authentication/http-auth.inc.php
@@ -1,5 +1,10 @@
 <?php
 
+if(!isset($_SESSION['username']))
+{
+  $_SESSION['username'] = '';
+}
+
 function authenticate($username,$password)
 {
   global $config;
@@ -71,4 +76,4 @@ function deluser($username)
   return 0;
 }
 
-?>
\ No newline at end of file
+?>