diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2d0e223a079..75415fc48ee 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -730,22 +730,15 @@ en:
         disable: "Disable Two Factor Authentication"
         enabled_status: "Status: On"
         disabled_status: "Status: Off"
-        confirm_password_description: "Confirm your password to continue enabling Two Factor Authentication"
+        confirm_password_description: "Please confirm your password to continue"
         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.
+          Scan this QR code in a supported app (<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_blank">Android</a> – <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8" target="_blank">iOS</a> – <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a>) and enter your authentication code.
         disable_description: "Enter the authentication code from your app"
-        show_key_description: "Or enter the secret key manually."
+        show_key_description: "Enter 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
-          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>.
-        oauth_enabled_warning: "Note that logins via social methods will be disabled once Two Factor Authentication has been enabled on your account."
+          Two factor authentication adds extra security to your account by requiring a one-time token in addition to your password. Tokens can be generated on <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target='_blank'>Android</a>, <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>, and <a href="https://www.microsoft.com/en-us/store/p/authenticator/9wzdncrfj3rj" target='_blank'>Windows Phone</a> devices.
+        oauth_enabled_warning: "Please note that social logins will be disabled once Two Factor Authentication has been enabled on your account."
 
       change_about:
         title: "Change About Me"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e0531dbd3bc..02aa93bbe23 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1812,9 +1812,9 @@ en:
     auth_complete: "Authentication is complete."
     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 the authentication code from your app."
-    invalid_second_factor_code: "Invalid Two Factor Authentication Code"
+    second_factor_title: "Two Factor Authentication"
+    second_factor_description: "Please enter the required authentication code from your app."
+    invalid_second_factor_code: "Invalid authentication code"
 
   user:
     no_accounts_associated: "No accounts associated"
@@ -2766,7 +2766,9 @@ en:
       title: "Two Factor Authentication disabled"
       subject_template: "[%{email_prefix}] Two Factor Authentication disabled"
       text_body_template: |
-        Your account’s Two Factor Authentication at %{site_name} has been disabled. The account no longer needs a Two Factor Authentication code to sign in.
+        Two factor authentication has been disabled on your account at %{site_name}. You can now log in with your password alone; an authentication code is no longer required.
+
+        If you did not choose to disable two factor authentication, someone may have compromised your account.
 
         If you have any questions, [contact our friendly staff](%{base_url}/about).