diff --git a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
index 3546063dc95..ae1bfec7dc3 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/login.js.handlebars
@@ -32,7 +32,7 @@
         <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
       </td>
       <td>
-        {{view Discourse.TextField valueBinding="view.loginName" placeholderKey="login.email_placeholder" elementId="login-account-name" autocorrect="off" autocapitalize="off"}}
+        {{view Discourse.TextField valueBinding="view.loginName" placeholderKey="login.email_placeholder" elementId="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
       </td>
       <tr>
       <td>
diff --git a/app/assets/javascripts/discourse/views/discourse_text_field.js b/app/assets/javascripts/discourse/views/discourse_text_field.js
index b938b0c59b6..879640c98b3 100644
--- a/app/assets/javascripts/discourse/views/discourse_text_field.js
+++ b/app/assets/javascripts/discourse/views/discourse_text_field.js
@@ -7,7 +7,7 @@
   @module Discourse
 **/
 Discourse.TextField = Ember.TextField.extend({
-  attributeBindings: ['autocorrect', 'autocapitalize'],
+  attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus'],
 
   placeholder: (function() {
     return Em.String.i18n(this.get('placeholderKey'));