diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index ed9e81a3..e0dc28bd 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -50,8 +50,9 @@ class Adminer {
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
 <?php
+		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		if ($this->permanentLogin()) {
-			echo "<p>" . checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+			echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 		}
 	}
 	
diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index e02daa06..c3e04f02 100644
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -81,9 +81,10 @@ function auth_error($exception = null) {
 	: ""))), null);
 	echo "<form action='' method='post'>\n";
 	$adminer->loginForm($username);
-	echo "<p>\n";
+	echo "<div>";
 	hidden_fields($_POST, array("server", "username", "password")); // expired session
-	echo "<input type='submit' value='" . lang('Login') . "'>\n</form>\n";
+	echo "</div>\n";
+	echo "</form>\n";
 	page_footer("auth");
 }
 
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 011d8c5c..85c9e728 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -31,8 +31,9 @@ class Adminer {
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
 <?php
+		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		if ($this->permanentLogin()) {
-			echo "<p>" . checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+			echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 		}
 	}