diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 24d1b09a..aab19455 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -999,11 +999,12 @@ class Adminer {
 			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
 				foreach ($servers as $server => $usernames) {
+					$name = h(get_setting("vendor-$server") ?: $drivers[$vendor]);
 					foreach ($usernames as $username => $password) {
 						if ($password !== null) {
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
 							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
+								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($name) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
 							}
 						}
 					}
diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index d01b8ce1..1c504d1b 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -169,6 +169,9 @@ if (isset($_GET["username"]) && is_string(get_password())) {
 		if ($adminer->operators === null) {
 			$adminer->operators = $driver->operators;
 		}
+		if (isset($connection->maria)) {
+			save_settings(array("vendor-" . SERVER => $drivers[DRIVER]));
+		}
 	}
 }
 
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 3c6c3693..953bd320 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -120,34 +120,6 @@ function referencable_primary($self) {
 	return $return;
 }
 
-/** Get settings stored in a cookie
-* @param string
-* @return array
-*/
-function get_settings($cookie) {
-	parse_str($_COOKIE[$cookie], $settings);
-	return $settings;
-}
-
-/** Get setting stored in a cookie
-* @param string
-* @param string
-* @return mixed
-*/
-function get_setting($key, $cookie = "adminer_settings") {
-	$settings = get_settings($cookie);
-	return $settings[$key];
-}
-
-/** Store settings to a cookie
-* @param array
-* @param string
-* @return bool
-*/
-function save_settings($settings, $cookie = "adminer_settings") {
-	return cookie($cookie, http_build_query($settings + get_settings($cookie)));
-}
-
 /** Print SQL <textarea> tag
 * @param string
 * @param string or array in which case [0] of every element is used
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index d45944fd..d0475f0e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -372,6 +372,34 @@ function cookie($name, $value, $lifetime = 2592000) {
 	);
 }
 
+/** Get settings stored in a cookie
+* @param string
+* @return array
+*/
+function get_settings($cookie) {
+	parse_str($_COOKIE[$cookie], $settings);
+	return $settings;
+}
+
+/** Get setting stored in a cookie
+* @param string
+* @param string
+* @return mixed
+*/
+function get_setting($key, $cookie = "adminer_settings") {
+	$settings = get_settings($cookie);
+	return $settings[$key];
+}
+
+/** Store settings to a cookie
+* @param array
+* @param string
+* @return bool
+*/
+function save_settings($settings, $cookie = "adminer_settings") {
+	return cookie($cookie, http_build_query($settings + get_settings($cookie)));
+}
+
 /** Restart stopped session
 * @return null
 */