3 files changed, 7 insertions, 12 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 2d6a71f2d..27c0690af 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -15,8 +15,7 @@
 [% END %]
 
 [% PROCESS global/header.html.tmpl
-  title = "Log in to $terms.Bugzilla",
-  onload = "document.forms['login'].Bugzilla_login.focus()"
+  title = "Log in to $terms.Bugzilla"
 %]
 
 [% USE Bugzilla %]
@@ -40,7 +39,7 @@
       </th>
       <td>
         <input size="35" id="Bugzilla_login" name="Bugzilla_login"
-               [%- ' type="email"' UNLESS Param('emailsuffix') %]>
+               [%- ' type="email"' UNLESS Param('emailsuffix') %] autofocus>
         [% Param('emailsuffix') FILTER html %]
       </td>
     </tr>
diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index 21d9251b5..1b5a4daa8 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -13,13 +13,9 @@
   # Param("emailsuffix") is used to pre-fill the email field.
   #%]
 
-[% title = BLOCK %]
-  Create a new [% terms.Bugzilla %] account
-[% END %]
-
 [% PROCESS global/header.html.tmpl
-           title = title
-           onload = "document.forms['account_creation_form'].login.focus();" %]
+           title = "Create a new $terms.Bugzilla account"
+%]
 
 <p>
   To create a [% terms.Bugzilla %] account, all you need to do is to enter
@@ -75,7 +71,7 @@
       Email address:
     [% END %]
   </span>
-  <input size="35" id="login" name="login"
+  <input size="35" id="login" name="login" autofocus
          [%- ' type="email"' UNLESS Param('emailsuffix') %]>
   [% Param('emailsuffix') FILTER html %]
   <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]">
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 45ef5c81c..ec8d5a474 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -15,7 +15,7 @@
 [% title = BLOCK %]Create a new user account for '[% email FILTER html %]'[% END %]
 [% PROCESS "global/header.html.tmpl"
            title = title
-           onload = "document.forms['confirm_account_form'].realname.focus();" %]
+%]
 
 <p>
   To create your account, you must enter a password in the form below.
@@ -33,7 +33,7 @@
     </tr>
     <tr>
       <th><small><i>(OPTIONAL)</i></small> <label for="realname">Real Name</label>:</th>
-      <td><input type="text" id="realname" name="realname" value=""></td>
+      <td><input id="realname" name="realname" autofocus></td>
     </tr>
     <tr>
       <th><label for="passwd1">Type your password</label>:</th>