diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
index a6aeda1a98..6cd05a616b 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-input.hbs
@@ -2,7 +2,7 @@
     type="tel"
     pattern='[0-9]{6}'
     maxlength='6'
-    id="login-second-factor"
+    id=inputId
     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 eb36a6ff6d..2c9dc879a8 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -45,7 +45,7 @@
           </table>
         </div>
         {{#second-factor-form}}
-          {{second-factor-input value=loginSecondFactor}}
+          {{second-factor-input value=loginSecondFactor inputId='login-second-factor'}}
         {{/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 ab877c9535..35f7015629 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -34,7 +34,7 @@
           </table>
         </div>
         {{#second-factor-form}}
-          {{second-factor-input value=loginSecondFactor}}
+          {{second-factor-input value=loginSecondFactor inputId='login-second-factor'}}
         {{/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 528b249ebc..9df31c2665 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -19,7 +19,7 @@
 
       <div class="control-group">
         <div class="controls">
-          {{second-factor-input value=secondFactorToken}}
+          {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
         </div>
 
         <div class='instructions'>
@@ -65,7 +65,7 @@
           <label class="control-label input-prepend">{{i18n 'login.second_factor_label'}}</label>
 
           <div class="controls">
-            {{second-factor-input value=secondFactorToken}}
+            {{second-factor-input value=secondFactorToken inputId='second-factor-token'}}
           </div>
         </div>