diff --git a/common.php b/common.php
index f092731b..9f125d1b 100644
--- a/common.php
+++ b/common.php
@@ -25,12 +25,6 @@ if (!defined('POSTFIXADMIN')) { # already defined if called from setup.php
         session_name('postfixadmin_session');
         session_start();
 
-        if (defined('POSTFIXADMIN_LOGOUT')) {
-            session_unset();
-            session_destroy();
-            session_start();
-        }
-
         if (empty($_SESSION['flash'])) {
             $_SESSION['flash'] = array();
         }
diff --git a/public/login.php b/public/login.php
index 269a8f77..bbb3a865 100644
--- a/public/login.php
+++ b/public/login.php
@@ -78,6 +78,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
     }
 }
 
+
+session_unset();
+session_destroy();
+session_start();
+
 $_SESSION['PFA_token'] = md5(uniqid(rand(), true));
 
 $smarty->assign('language_selector', language_selector(), false);