diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 027f8ae462..13cbbc5da9 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -42,7 +42,7 @@
       {{#if loaded}}
         <div class="control-group">
           <div class="controls">
-            {{i18n 'user.second_factor.enable_description'}}
+            {{{i18n 'user.second_factor.enable_description'}}}
           </div>
         </div>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 590c6fa188..1f7d00b805 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -713,11 +713,20 @@ en:
         enable: "Enable Two Factor Authentication"
         disable: "Disable Two Factor Authentication"
         confirm_password_description: "Confirm your password to continue enabling Two Factor Authentication."
-        enable_description: "To complete Two Factor Authentication setup, scan the following QR code and submit a Two Factor Authentication code."
-        disable_description: "Enter a Two Factor Authentication code to disable."
+        enable_description: |
+          To complete Two Factor Authentication setup, scan the following QR code
+          in one of the supported apps
+          (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android and iOS</a>,
+          <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>)
+          and submit the generated Two Factor Authentication code.
+        disable_description: "Enter the authentication code from your app"
         show_key_description: "Or enter the key manually."
         info_prompt: "What is Two Factor Authentication?"
-        extended_description: "Two Factor Authentication adds an extra security step to logging in by requiring a one-time token in addition to your password. These tokens are generated by compatible apps for iPhone or Android such as <a href=\"https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2\" target='_blank'>Google Authenticator</a>, <a href=\"https://play.google.com/store/apps/details?id=com.authy.authy\" target='_blank'>Authy</a>, and <a href=\"https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp\" target='_blank'>FreeOTP</a>."
+        extended_description: |
+          Two Factor Authentication adds an extra security step to logging in by
+          requiring a one-time token in addition to your password. These tokens
+          can be generated on Android and iOS by <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Google Authenticator</a>
+          and on Windows Phone by <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Authenticator</a>.
 
       change_about:
         title: "Change About Me"
@@ -1111,7 +1120,7 @@ en:
       username: "User"
       password: "Password"
       second_factor_title: "Two Factor Authentication Required"
-      second_factor_description: "Enter a generated verification code."
+      second_factor_description: "Enter the authentication code from your app."
       second_factor_label: "Code"
       email_placeholder: "email or username"
       caps_lock_warning: "Caps Lock is on"
@@ -3279,7 +3288,7 @@ en:
             post_locked: "post locked"
             post_unlocked: "post unlocked"
             check_personal_message: "check personal message"
-            disabled_second_factor: "disable 2 factor authentication"
+            disabled_second_factor: "disable Two Factor Authentication"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e0b65780c9..64837655be 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1790,7 +1790,7 @@ en:
     click_to_continue: "Click here to continue."
     already_logged_in: "Oops, looks like you are attempting to accept an invitation for another user. If you are not %{current_user}, please log out and try again."
     second_factor_title: "Two Factor Authentication Required"
-    second_factor_description: "Enter a generated authentication code."
+    second_factor_description: "Enter the authentication code from your app."
     invalid_second_factor_code: "Invalid Two Factor Authentication Code"
 
   user: