diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index bb9fa19185..cd45f34f48 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -359,6 +359,10 @@ if ($config['enterprise_installed']) {
 }
 
 // CSRF validation.
+if (isset($_SESSION['csrf_code']) === true) {
+    unset($_SESSION['csrf_code']);
+}
+
 html_print_csrf_hidden();
 
     echo '</form></div>';
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 1826dbe789..d7f124575b 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1049,6 +1049,7 @@ if (isset($_GET['bye'])) {
     header_remove('Set-Cookie');
     setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
+    generate_csrf_code();
     // Process logout.
     include 'general/logoff.php';