diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
index f1d4bb0dbf8..1559d59eba1 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
@@ -21,10 +21,10 @@ export default Ember.Controller.extend({
   },
 
   toggleSecondFactor(enable) {
-    if (!this.get('second_factor_token')) return;
+    if (!this.get('secondFactorToken')) return;
     this.set('loading', true);
 
-    this.get('content').toggleSecondFactor(this.get('second_factor_token'), enable)
+    this.get('content').toggleSecondFactor(this.get('secondFactorToken'), enable)
       .then(response => {
         if (response.error) {
           this.set('errorMessage', response.error);
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
new file mode 100644
index 00000000000..a6aeda1a980
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
@@ -0,0 +1,8 @@
+{{text-field value=value
+    type="tel"
+    pattern='[0-9]{6}'
+    maxlength='6'
+    id="login-second-factor"
+    autocorrect="off"
+    autocapitalize="off"
+    autofocus="autofocus"}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 5f0336aa765..eb36a6ff6dc 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -45,13 +45,7 @@
           </table>
         </div>
         {{#second-factor-form}}
-          {{text-field value=loginSecondFactor
-              pattern='[0-9]{6}'
-              maxlength='6'
-              id="login-second-factor"
-              autocorrect="off"
-              autocapitalize="off"
-              autofocus="autofocus"}}
+          {{second-factor-input value=loginSecondFactor}}
         {{/second-factor-form}}
       </form>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 3e0889be68a..ab877c95354 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -34,13 +34,7 @@
           </table>
         </div>
         {{#second-factor-form}}
-          {{text-field value=loginSecondFactor
-              pattern='[0-9]{6}'
-              maxlength='6'
-              id="login-second-factor"
-              autocorrect="off"
-              autocapitalize="off"
-              autofocus="autofocus"}}
+          {{second-factor-input value=loginSecondFactor}}
         {{/second-factor-form}}
       </form>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index b85a063b705..528b249ebcf 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -19,12 +19,7 @@
 
       <div class="control-group">
         <div class="controls">
-          {{text-field value=second_factor_token
-              pattern='[0-9]{6}'
-              maxlength='6'
-              id="second-factor-token"
-              classNames="input-large"
-              autofocus="autofocus"}}
+          {{second-factor-input value=secondFactorToken}}
         </div>
 
         <div class='instructions'>
@@ -70,12 +65,7 @@
           <label class="control-label input-prepend">{{i18n 'login.second_factor_label'}}</label>
 
           <div class="controls">
-            {{text-field value=second_factor_token
-                pattern='[0-9]{6}'
-                maxlength='6'
-                id="second-factor-token"
-                classNames="input-large"
-                autofocus="autofocus"}}
+            {{second-factor-input value=secondFactorToken}}
           </div>
         </div>
 
diff --git a/app/views/common/_second_factor_text_field.html.erb b/app/views/common/_second_factor_text_field.html.erb
new file mode 100644
index 00000000000..ad6d61c3979
--- /dev/null
+++ b/app/views/common/_second_factor_text_field.html.erb
@@ -0,0 +1 @@
+<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[0-9]{6}', maxlength: 6, type: 'tel') %>
diff --git a/app/views/session/email_login.html.erb b/app/views/session/email_login.html.erb
index 6e84c224900..a0f390df785 100644
--- a/app/views/session/email_login.html.erb
+++ b/app/views/session/email_login.html.erb
@@ -10,7 +10,7 @@
       <%= form_tag(method: "post") do%>
         <h2><%=t "login.second_factor_title" %></h2>
         <%= label_tag(:second_factor_token, t("login.second_factor_description")) %>
-        <div><%= text_field_tag(:second_factor_token, pattern: '[0-9]{6}', maxlength: 6) %></div>
+        <div><%= render 'common/second_factor_text_field' %></div>
         <%= submit_tag(t("submit"), class: "btn btn-large btn-primary") %>
       <%end%>
     </div>
diff --git a/app/views/users/admin_login.html.erb b/app/views/users/admin_login.html.erb
index ee3c941ac73..23049440715 100644
--- a/app/views/users/admin_login.html.erb
+++ b/app/views/users/admin_login.html.erb
@@ -10,7 +10,7 @@
       <% if @second_factor_required %>
         <%=form_tag({}, method: :put) do %>
           <%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
-          <%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[0-9]{6}', maxlength: 6) %><br><br>
+          <%= render 'common/second_factor_text_field' %><br><br>
           <%= submit_tag t('submit')%>
         <% end %>
       <% end %>