diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index d174835e..c261b07f 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -4,7 +4,6 @@ if (isset($_POST["server"])) {
 	session_regenerate_id(); // defense against session fixation
 	$_SESSION["usernames"][$_POST["server"]] = $_POST["username"];
 	$_SESSION["passwords"][$_POST["server"]] = $_POST["password"];
-	$_SESSION["tokens"][$_POST["server"]] = rand(1, 1e6); // defense against cross-site request forgery
 	if (count($_POST) == count($ignore)) {
 		$location = ((string) $_GET["server"] === $_POST["server"] ? remove_from_uri() : preg_replace('~^([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . (strlen($_POST["server"]) ? '?server=' . urlencode($_POST["server"]) : ''));
 		if (!isset($_COOKIE[session_name()])) {
@@ -12,12 +11,10 @@ if (isset($_POST["server"])) {
 		}
 		redirect($location);
 	}
-	if ($_POST["token"]) {
-		$_POST["token"] = $_SESSION["tokens"][$_POST["server"]];
-	}
 	$_GET["server"] = $_POST["server"];
 } elseif (isset($_POST["logout"])) {
-	if ($_POST["token"] != $_SESSION["tokens"][$_GET["server"]]) {
+	$token = $_SESSION["tokens"][$_GET["server"]];
+	if ($token && $_POST["token"] != $token) {
 		page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
 		page_footer("db");
 		exit;
@@ -25,6 +22,9 @@ if (isset($_POST["server"])) {
 		foreach (array("usernames", "passwords", "databases", "tokens", "history") as $val) {
 			unset($_SESSION[$val][$_GET["server"]]);
 		}
+		if (!isset($_SESSION["passwords"])) { // don't require login to logout
+			$_SESSION["passwords"] = array();
+		}
 		redirect(substr(ME, 0, -1), lang('Logout successful.'));
 	}
 }
@@ -49,6 +49,13 @@ function auth_error($exception = null) {
 	page_footer("auth");
 }
 
+if (!$_SESSION["tokens"][$_GET["server"]]) {
+	$_SESSION["tokens"][$_GET["server"]] = rand(1, 1e6); // defense against cross-site request forgery
+	if ($_POST["token"]) {
+		$_POST["token"] = $_SESSION["tokens"][$_GET["server"]];
+	}
+}
+
 $username = &$_SESSION["usernames"][$_GET["server"]];
 if (!isset($username)) {
 	$username = $_GET["username"]; // default username can be passed in URL