diff --git a/account.php b/account.php
index 973e310..04454f4 100644
--- a/account.php
+++ b/account.php
@@ -58,10 +58,6 @@ function do_account($sCmd = null)
             if($_SESSION['current'])
                 $_SESSION['current']->logout();
 
-            /* destroy all session variables */
-            $GLOBALS['session']->destroy();
-
-            addmsg("You are successfully logged out.", "green");
             redirect(apidb_fullurl("index.php"));
             exit;
     }
diff --git a/include/user.php b/include/user.php
index 0c3dc2d..4bb4360 100644
--- a/include/user.php
+++ b/include/user.php
@@ -82,15 +82,16 @@ class User {
             return SUCCESS;
         }
 
-        /* null out the session variable for the current user since we failed to login */
-        $_SESSION['current'] = "";
+        /* destroy all session variables since we failed to login */
+        $GLOBALS['session']->destroy();
+
         return USER_LOGIN_FAILED;
     }
 
     function logout()
     {
-        /* null out the session current variable to log us out */
-        $_SESSION['current'] = "";
+        /* destroy all session variables since we are logging out */
+        $GLOBALS['session']->destroy();
     }