diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 4e52aef5..2437ee66 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -41,9 +41,12 @@ class Adminer {
 <table cellspacing="0">
 <tr><th><?php echo lang('System'); ?><td><?php echo (count($possible_drivers) > 3 ? html_select("driver", $drivers, DRIVER) : "<input type='hidden' name='driver' value='" . key($drivers) . "'>" . reset($drivers)); ?></tr>
 <tr><th><?php echo lang('Server'); ?><td><input name="server" value="<?php echo h(SERVER); ?>">
-<tr><th><?php echo lang('Username'); ?><td><input name="username" value="<?php echo h($_GET["username"]); ?>">
+<tr><th><?php echo lang('Username'); ?><td><input id="username" name="username" value="<?php echo h($_GET["username"]); ?>">
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
+<script type="text/javascript">
+document.getElementById('username').focus();
+</script>
 <?php
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		if ($this->permanentLogin()) {
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index f6aad529..d68971df 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -29,9 +29,12 @@ class Adminer {
 	function loginForm() {
 		?>
 <table cellspacing="0">
-<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="driver" value="server"><input type="hidden" name="server" value=""><input name="username" value="<?php echo h($_GET["username"]);  ?>">
+<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="driver" value="server"><input type="hidden" name="server" value=""><input id="username" name="username" value="<?php echo h($_GET["username"]);  ?>">
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
+<script type="text/javascript">
+document.getElementById('username').focus();
+</script>
 <?php
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		if ($this->permanentLogin()) {