diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index f5cc976902..710a2a084a 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -105,6 +105,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
             $("#credentials").hide();
             $("#second-factor").show();
+            $("#second-factor input").focus();
+
             return;
           } else if (result.reason === 'not_activated') {
             self.send('showNotActivated', {
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index a1d5e03340..c6e6e6d435 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -4,9 +4,6 @@
 
   <table>
     <tr>
-      <td>
-        <label for='login-second-factor'>{{i18n 'login.second_factor_label'}}&nbsp;</label>
-      </td>
       <td>
         {{yield}}
       </td>