diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 836f101b1905dc852713051097233d3cbde763ba..a23543f2ff53a8d28474b3ca06e7e05c24781414 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1871,6 +1871,9 @@ function user_login($form, &$form_state) {
     '#size' => 60,
     '#maxlength' => USERNAME_MAX_LENGTH,
     '#required' => TRUE,
+    '#attributes' => array(
+      'autofocus' => 'autofocus',
+    ),
   );
 
   $form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'Drupal')));