diff --git a/src/Form/TFASettingsType.php b/src/Form/TFASettingsType.php
index ae1d9326..fa9da818 100644
--- a/src/Form/TFASettingsType.php
+++ b/src/Form/TFASettingsType.php
@@ -20,7 +20,7 @@ class TFASettingsType extends AbstractType
     {
         $builder->add('google_confirmation', TextType::class, [
             'mapped' => false,
-            'attr' => ['maxlength' => '6', 'minlength' => '6', 'pattern' => '\d*'],
+            'attr' => ['maxlength' => '6', 'minlength' => '6', 'pattern' => '\d*', 'autocomplete' => 'off'],
             'constraints' => [new ValidGoogleAuthCode()]
         ]);
 
diff --git a/templates/Users/_2fa_settings.html.twig b/templates/Users/_2fa_settings.html.twig
index 19b9d23b..f24ec557 100644
--- a/templates/Users/_2fa_settings.html.twig
+++ b/templates/Users/_2fa_settings.html.twig
@@ -26,10 +26,26 @@
                             <li>{% trans %}tfa_google.step.download{% endtrans %}</li>
                             <li>{% trans %}tfa_google.step.scan{% endtrans %}</li>
                             <li>{% trans %}tfa_google.step.input_code{% endtrans %}</li>
+                            <li>{% trans %}tfa_google.step.download_backup{% endtrans %}</li>
                         </ol>
                     </div>
                 </div>
 
+                <div class="offset-3">
+                    <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#manualSetupCollapse" aria-expanded="false" aria-controls="manualSetupCollapse">
+                        {% trans %}tfa_google.manual_setup{% endtrans %}
+                    </button>
+                    <div class="collapse" id="manualSetupCollapse">
+                        <div class="card card-body mb-2">
+                            <p><b>{% trans %}tfa_google.manual_setup.type</b>{% endtrans %}: TOTP</p>
+                            <p><b>{% trans %}tfa_google.manual_setup.username</b>{% endtrans %}: {{ tfa_google.username }}</p>
+                            <p><b>{% trans %}tfa_google.manual_setup.secret</b>{% endtrans %}: {{ tfa_google.secret }}</p>
+                            <p><b>{% trans %}tfa_google.manual_setup.digit_count</b>{% endtrans %}: 6</p>
+
+                        </div>
+                    </div>
+                </div>
+
                 {{ form_row(tfa_form.google_confirmation) }}
             </div>
             <div class="tab-pane fade" id="tfa-backup" role="tabpanel" aria-labelledby="backup-tab">