diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 97b5e1d1..a6347bc3 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -702,7 +702,7 @@ DROP PROCEDURE adminer_alter;
 					foreach ($usernames as $username => $password) {
 						if (isset($password)) {
 							if ($first) {
-								echo "<p>\n";
+								echo "<p onclick='eventStop(event);'>\n";
 								$first = false;
 							}
 							echo "<a href='" . h(auth_url($driver, $server, $username)) . "'>($drivers[$driver]) " . h($username . ($server != "" ? "@$server" : "")) . "</a><br>\n";
diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index d951c526..b0a7034c 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -73,9 +73,8 @@ function auth_error($exception = null) {
 			}
 		}
 	}
-	unset($_GET["username"]); // checked in page_header() for successful login
 	page_header(lang('Login'), $error, null);
-	echo "<form action='' method='post'>\n";
+	echo "<form action='' method='post' onclick='eventStop(event);'>\n";
 	$adminer->loginForm();
 	echo "<div>";
 	hidden_fields($_POST, array("driver", "server", "username", "password", "permanent")); // expired session
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index e0580091..903c12fb 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -32,7 +32,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <link rel="stylesheet" type="text/css" href="adminer.css">
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?>"<?php if (isset($_GET["username"])) { ?> onclick="return bodyClick(event, '<?php echo js_escape(DB); ?>', '<?php echo js_escape($_GET["ns"]); ?>');"<?php } ?> onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
+<body class="<?php echo lang('ltr'); ?>" onclick="return bodyClick(event, '<?php echo js_escape(DB); ?>', '<?php echo js_escape($_GET["ns"]); ?>');" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
 <script type="text/javascript" src="../adminer/static/functions.js"></script>
 <script type="text/javascript" src="static/editing.js"></script>
 
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 9ef3e45f..a18fa31e 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -399,16 +399,3 @@ function schemaMouseup(ev) {
 		cookie('adminer_schema=' + encodeURIComponent(s.substr(1)), 30, '; path="' + location.pathname + location.search + '"');
 	}
 }
-
-
-
-/** Stop event propagation
-* @param Event
-*/
-function eventStop(event) {
-	if (event.stopPropagation) {
-		event.stopPropagation();
-	} else {
-		event.cancelBubble = true;
-	}
-}
diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 96058c42..d443916d 100644
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -393,3 +393,14 @@ function bodyClick(event, db, ns) {
 	}
 	return true;
 }
+
+/** Stop event propagation
+* @param Event
+*/
+function eventStop(event) {
+	if (event.stopPropagation) {
+		event.stopPropagation();
+	} else {
+		event.cancelBubble = true;
+	}
+}
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 85fc5a5b..07e99932 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -479,7 +479,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) {
 				if (isset($password)) {
 					if ($first) {
-						echo "<p>\n";
+						echo "<p onclick='eventStop(event);'>\n";
 						$first = false;
 					}
 					echo "<a href='" . h(auth_url("server", "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a><br>\n";
