diff --git a/core/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java b/core/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java
index 7a0b422ecf..4d2ebfcea7 100644
--- a/core/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java
+++ b/core/src/main/java/org/springframework/security/ui/webapp/DefaultLoginPageGeneratingFilter.java
@@ -65,10 +65,10 @@ public class DefaultLoginPageGeneratingFilter extends SpringSecurityFilter {
             }
         }
 
-        return "<html><head><title>Login Page</title></head><body>\n" +
+        return "<html><head><title>Login Page</title></head><body onload='document.f.j_username.focus();'>\n" +
                 (loginError ? ("<font color='red'>Your login attempt was not successful, try again.<br/><br/>Reason: " +
                         errorMsg + "</font>") : "") +
-                " <form action='" + request.getContextPath() + authenticationUrl + "' method='POST'>\n" +
+                " <form name='f' action='" + request.getContextPath() + authenticationUrl + "' method='POST'>\n" +
                 "   <table>\n" +
                 "     <tr><td>User:</td><td><input type='text' name='" + usernameParameter + "'  value='" + lastUser +
                 "'></td></tr>\n" +
diff --git a/samples/contacts/src/main/webapp/acegilogin.jsp b/samples/contacts/src/main/webapp/acegilogin.jsp
index 4d5cb5fabc..9950356282 100644
--- a/samples/contacts/src/main/webapp/acegilogin.jsp
+++ b/samples/contacts/src/main/webapp/acegilogin.jsp
@@ -8,7 +8,7 @@
     <title>Login</title>
   </head>
 
-  <body>
+  <body onload="document.f.j_username.focus();">
     <h1>Login</h1>
 
 	<P>Valid users:
@@ -32,7 +32,7 @@
       </font>
     </c:if>
 
-    <form action="<c:url value='j_spring_security_check'/>" method="POST">
+    <form name="f" action="<c:url value='j_spring_security_check'/>" method="POST">
       <table>
         <tr><td>User:</td><td><input type='text' name='j_username' <c:if test="${not empty param.login_error}">value='<%= session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>'</c:if>></td></tr>
         <tr><td>Password:</td><td><input type='password' name='j_password'></td></tr>

User:	value='<%= session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>'>
Password: