diff --git a/app/assets/javascripts/discourse/components/second-factor-input.js.es6 b/app/assets/javascripts/discourse/components/second-factor-input.js.es6
index 45ed1f4b9e..98ca98ac01 100644
--- a/app/assets/javascripts/discourse/components/second-factor-input.js.es6
+++ b/app/assets/javascripts/discourse/components/second-factor-input.js.es6
@@ -19,6 +19,6 @@ export default Component.extend({
   @discourseComputed("secondFactorMethod")
   maxlength(secondFactorMethod) {
     if (secondFactorMethod === SECOND_FACTOR_METHODS.TOTP) return "6";
-    if (secondFactorMethod === SECOND_FACTOR_METHODS.BACKUP_CODE) return "16";
+    if (secondFactorMethod === SECOND_FACTOR_METHODS.BACKUP_CODE) return "32";
   }
 });
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index b1a37b966c..ceb4c80a92 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -594,9 +594,9 @@
       .wrapper {
         display: inline-block;
         position: relative;
-        padding: 10px;
         border-radius: 3px;
         border: 1px solid $primary-low;
+        width: 100%;
       }
 
       .backup-codes-area {
@@ -604,11 +604,10 @@
         padding: 0;
         height: auto;
         text-align: center;
-        width: 250px;
+        width: 100%;
         background: white;
         border: 0;
         cursor: auto;
-        overflow: hidden;
         outline: none;
         font-family: monospace;
 
diff --git a/app/views/common/_second_factor_backup_input.html.erb b/app/views/common/_second_factor_backup_input.html.erb
index dfe1961672..58abb897d0 100644
--- a/app/views/common/_second_factor_backup_input.html.erb
+++ b/app/views/common/_second_factor_backup_input.html.erb
@@ -1,2 +1,2 @@
-<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[a-z0-9]{16}', maxlength: 16, type: 'text') %>
+<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[a-z0-9]{16}', maxlength: 32, type: 'text') %>
 <%= hidden_field_tag 'second_factor_method', '2' %>
\ No newline at end of file