diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index e35ebdea435..6950e2e332d 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -13,10 +13,16 @@
       - if current_user.two_factor_otp_enabled?
         %p
           You've already enabled two-factor authentication using mobile authenticator applications. In order to register a different device, you must first disable two-factor authentication.
+        %p
+          If you lose your recovery codes you can generate new ones, invalidating all previous codes.
+        %div
           = link_to 'Disable two-factor authentication', profile_two_factor_auth_path,
                 method: :delete,
                 data: { confirm: "Are you sure? This will invalidate your registered applications and U2F devices." },
-                class: 'btn btn-danger'
+                class: 'btn btn-danger append-right-10'
+          = form_tag codes_profile_two_factor_auth_path, {style: 'display: inline-block', method: :post} do |f|
+            = submit_tag 'Regenerate recovery codes', class: 'btn'
+
       - else
         %p
           Download the Google Authenticator application from App Store or Google Play Store and scan this code.
diff --git a/changelogs/unreleased/regen-2fa-codes.yml b/changelogs/unreleased/regen-2fa-codes.yml
new file mode 100644
index 00000000000..596f759df0f
--- /dev/null
+++ b/changelogs/unreleased/regen-2fa-codes.yml
@@ -0,0 +1,5 @@
+---
+title: Added button to regenerate 2FA codes
+merge_request:
+author: Luke Picciau
+type: added