diff --git a/app/views/account/twofa_confirm.html.erb b/app/views/account/twofa_confirm.html.erb
index 5cf3b3dda..aaf6d3ecb 100644
--- a/app/views/account/twofa_confirm.html.erb
+++ b/app/views/account/twofa_confirm.html.erb
@@ -12,7 +12,7 @@
       <%=l 'twofa_label_code' -%>
       <%= link_to l('twofa_resend_code'), { controller: 'account', action: 'twofa_resend' }, method: :post, class: 'lost_password' if @twofa_view[:resendable] -%>
     </label>
-    <%= text_field_tag :twofa_code, nil, tabindex: '1', autocomplete: 'off', autofocus: true -%>
+    <%= text_field_tag :twofa_code, nil, tabindex: '1', autocomplete: 'one-time-code', autofocus: true -%>
 
     <%= submit_tag l(:button_login), tabindex: '2', id: 'login-submit', name: :submit_otp -%>
   <% end %>
diff --git a/app/views/twofa/_twofa_code_form.html.erb b/app/views/twofa/_twofa_code_form.html.erb
index b9d0e1bf7..5ba01dfbf 100644
--- a/app/views/twofa/_twofa_code_form.html.erb
+++ b/app/views/twofa/_twofa_code_form.html.erb
@@ -3,7 +3,7 @@
   <div class="tabular">
     <p>
       <label for="twofa_code"><%=l 'twofa_label_code' -%></label>
-      <%= text_field_tag :twofa_code, nil, autocomplete: 'off' -%>
+      <%= text_field_tag :twofa_code, nil, autocomplete: 'one-time-code' -%>
     </p>
   </div>
 </div>
diff --git a/app/views/twofa/activate_confirm.html.erb b/app/views/twofa/activate_confirm.html.erb
index 78194c62b..6a9bb070e 100644
--- a/app/views/twofa/activate_confirm.html.erb
+++ b/app/views/twofa/activate_confirm.html.erb
@@ -12,7 +12,7 @@
         <%= render partial: "twofa/#{@twofa_view[:scheme_name]}/new", locals: { twofa_view: @twofa_view } -%>
         <p>
           <label for="twofa_code"><%=l 'twofa_label_code' -%></label>
-          <%= text_field_tag :twofa_code, nil, autocomplete: 'off', autofocus: true -%>
+          <%= text_field_tag :twofa_code, nil, autocomplete: 'one-time-code', autofocus: true -%>
         </p>
       </div>
     </div>