diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 1b4cbd15..675bd346 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -59,8 +59,8 @@ if ($auth) {
 function unset_permanent() {
 	global $permanent;
 	foreach ($permanent as $key => $val) {
-		list($driver, $server, $username) = array_map('base64_decode', explode("-", $key));
-		if ($driver == DRIVER && $server == SERVER && $db == $_GET["username"]) {
+		list($driver, $server, $username, $db) = array_map('base64_decode', explode("-", $key));
+		if ($driver == DRIVER && $server == SERVER && $username == $_GET["username"] && $db == DB) {
 			unset($permanent[$key]);
 		}
 	}
diff --git a/changes.txt b/changes.txt
index 2fc32224..f38cb2e1 100644
--- a/changes.txt
+++ b/changes.txt
@@ -12,6 +12,7 @@ Allow loading more data with inline edit (bug #3605531)
 Stay on the same page after deleting rows (bug #3605845)
 Respect checked tables in export filename (bug #3245464)
 Respect PHP configuration max_input_vars
+Fix unsetting permanent login after logout
 Disable autocapitalize in identifiers on mobile browsers
 MySQL: Compatibility with MySQL 5.6
 MySQL: Move ALTER export to plugin