diff --git a/checkin_notes b/checkin_notes
index 2dc163de57..987b02b94f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7171,3 +7171,8 @@ Karl 2003-10-17
       clean install)
 
     - BOINC 2.08 release
+
+David  28 Oct 2003
+    - login form: keyboard focus is on auth input field
+    html_user/
+        util.inc
diff --git a/html/user/util.inc b/html/user/util.inc
index cf14776c49..77c593b7ce 100644
--- a/html/user/util.inc
+++ b/html/user/util.inc
@@ -228,7 +228,8 @@ function print_country_select($selected_country="None") {
 }
 
 function print_login_form_aux($next_url, $user, $pathMod='') {
-    echo "<form method=post action=\"", $pathMod, "login_action.php\">
+    echo "
+        <form name=f method=post action=\"", $pathMod, "login_action.php\">
         <input type=hidden name=next_url value='$next_url'>
     ";
     start_table();
@@ -250,6 +251,12 @@ function print_login_form_aux($next_url, $user, $pathMod='') {
         );
     }
     end_table();
+    echo "
+        </form>
+        <script>
+            document.f.authenticator.focus();
+        </script>
+    ";
 }
 
 function print_login_form($pathMod="") {