diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5d68ca9d..a0e41ea3 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1001,7 +1001,7 @@ class Adminer {
 			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
 				foreach ($servers as $server => $usernames) {
-					$name = h(get_setting("vendor-$server") ?: $drivers[$vendor]);
+					$name = h(get_setting("vendor-$vendor-$server") ?: $drivers[$vendor]);
 					foreach ($usernames as $username => $password) {
 						if ($password !== null) {
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 69229ae3..f53a9198 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -188,7 +188,7 @@ if (isset($_GET["username"]) && is_string(get_password())) {
 			$adminer->operators = $driver->operators;
 		}
 		if (isset($connection->maria) || $connection->cockroach) {
-			save_settings(array("vendor-" . SERVER => $drivers[DRIVER]));
+			save_settings(array("vendor-" . DRIVER . "-" . SERVER => $drivers[DRIVER]));
 		}
 	}
 }