diff --git a/webapp/channels/src/components/mfa/__snapshots__/confirm.test.tsx.snap b/webapp/channels/src/components/mfa/__snapshots__/confirm.test.tsx.snap
index a2f89faa12..cc84cb4d16 100644
--- a/webapp/channels/src/components/mfa/__snapshots__/confirm.test.tsx.snap
+++ b/webapp/channels/src/components/mfa/__snapshots__/confirm.test.tsx.snap
@@ -15,7 +15,7 @@ exports[`components/mfa/components/Confirm should match snapshot 1`] = `
     </strong>
     <p>
       <MemoizedFormattedMessage
-        defaultMessage="Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone."
+        defaultMessage="Your account is now secure. Next time you sign in, you will be asked to enter a code from your authenticator app on your phone."
         id="mfa.confirm.secure"
       />
     </p>
diff --git a/webapp/channels/src/components/mfa/confirm.tsx b/webapp/channels/src/components/mfa/confirm.tsx
index 725c21939c..7c6a2f882c 100644
--- a/webapp/channels/src/components/mfa/confirm.tsx
+++ b/webapp/channels/src/components/mfa/confirm.tsx
@@ -47,7 +47,7 @@ export default function Confirm() {
                 <p>
                     <FormattedMessage
                         id='mfa.confirm.secure'
-                        defaultMessage='Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.'
+                        defaultMessage='Your account is now secure. Next time you sign in, you will be asked to enter a code from your authenticator app on your phone.'
                     />
                 </p>
                 <button
diff --git a/webapp/channels/src/components/mfa/setup/setup.tsx b/webapp/channels/src/components/mfa/setup/setup.tsx
index 3c2d068784..f14ea689e2 100644
--- a/webapp/channels/src/components/mfa/setup/setup.tsx
+++ b/webapp/channels/src/components/mfa/setup/setup.tsx
@@ -101,7 +101,7 @@ export default class Setup extends React.PureComponent<Props, State> {
                 error: (
                     <FormattedMessage
                         id='mfa.setup.codeError'
-                        defaultMessage='Please enter the code from Google Authenticator.'
+                        defaultMessage='Please enter the code from your authenticator app.'
                     />
                 ),
             });
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 6d5f8984fe..8c804a61a9 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -2397,7 +2397,7 @@
   "admin.service.managedResourcePathsDescription": "A comma-separated list of paths on the Mattermost server that are managed by another service. See <link>here</link> for more information.",
   "admin.service.maximumPayloadSize": "Maximum Payload Size (Bytes):",
   "admin.service.maximumPayloadSizeDescription": "The maximum number of bytes allowed in the payload of incoming HTTP calls",
-  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using Google Authenticator.",
+  "admin.service.mfaDesc": "When true, users with AD/LDAP or email login can add multi-factor authentication to their account using an authenticator app.",
   "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
   "admin.service.minimumHashtagLengthDescription": "Minimum number of characters in a hashtag. This must be greater than or equal to 2. MySQL databases must be configured to support searching strings shorter than three characters, <link>see documentation</link>.",
   "admin.service.minimumHashtagLengthExample": "E.g.: \"3\"",
@@ -4444,10 +4444,10 @@
   "message_submit_error.sendAsMessageLink": "Click here to send as a message.",
   "mfa.confirm.complete": "Set up complete!",
   "mfa.confirm.okay": "Okay",
-  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from the Google Authenticator app on your phone.",
+  "mfa.confirm.secure": "Your account is now secure. Next time you sign in, you will be asked to enter a code from your authenticator app on your phone.",
   "mfa.setup.badCode": "Invalid code. If this issue persists, contact your System Administrator.",
   "mfa.setup.code": "MFA Code",
-  "mfa.setup.codeError": "Please enter the code from Google Authenticator.",
+  "mfa.setup.codeError": "Please enter the code from your authenticator app.",
   "mfa.setup.required_mfa": "<strong>Multi-factor authentication is required on {siteName}.</strong>",
   "mfa.setup.save": "Save",
   "mfa.setup.secret": "Secret: {secret}",