diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/openid/openid_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/openid/openid_spec.js
index e98f85d203..4cb8889a6e 100644
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/openid/openid_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/openid/openid_spec.js
@@ -126,7 +126,7 @@ describe('System Console OpenId Connect', () => {
             expect(config.Office365Settings.Id).to.equal('Office365Id');
             expect(config.Office365Settings.DiscoveryEndpoint).to.equal('https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration');
         });
-        verifyOAuthLogin('Office 365', '', Cypress.config('baseUrl') + '/oauth/office365/login');
+        verifyOAuthLogin('Entra ID', '', Cypress.config('baseUrl') + '/oauth/office365/login');
     });
 });
 
diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx
index ac06f00f1b..1c74cea434 100644
--- a/webapp/channels/src/components/admin_console/admin_definition.tsx
+++ b/webapp/channels/src/components/admin_console/admin_definition.tsx
@@ -4580,7 +4580,7 @@ const AdminDefinition: AdminDefinitionType = {
                                     value: Constants.GOOGLE_SERVICE,
                                     display_name: defineMessage({id: 'admin.oauth.google', defaultMessage: 'Google Apps'}),
                                     isHidden: it.all(it.not(it.licensedForFeature('GoogleOAuth')), it.not(it.cloudLicensed)),
-                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand sidebar and enter "Mattermost - your-company-name" as the <strong>Project Name</strong>, then click <strong>Create</strong>.\n3. Click the <strong>OAuth consent screen</strong> header and enter "Mattermost" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.\n4. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n5. Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}),
+                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand sidebar and enter "Mattermost - your-company-name" as the <strong>Project Name</strong>, then click <strong>Create</strong>.\n3. Click the <strong>OAuth consent screen</strong> header and enter "Mattermost" as the <strong>Product name shown to users</strong>, then click <strong>Save</strong>.\n4. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n5. Under <strong>Restrictions</strong> and <strong>Authorized redirect URIs</strong> enter <strong>"your-mattermost-url/signup/google/complete"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}),
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
@@ -4612,15 +4612,15 @@ const AdminDefinition: AdminDefinitionType = {
                                 },
                                 {
                                     value: Constants.OFFICE365_SERVICE,
-                                    display_name: defineMessage({id: 'admin.oauth.office365', defaultMessage: 'Office 365'}),
+                                    display_name: defineMessage({id: 'admin.oauth.office365', defaultMessage: 'Entra ID'}),
                                     isHidden: it.all(it.not(it.licensedForFeature('Office365OAuth')), it.not(it.cloudLicensed)),
-                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft or Office 365 account. Make sure it`s the account on the same <linkTenant>tenant</linkTenant> that you would like users to log in with.\n2. Go to <linkApps>https://apps.dev.microsoft.com</linkApps>, click <strong>Go to app list</strong> > <strong>Add an app</strong> and use "Mattermost - your-company-name" as the <strong>Application Name</strong>.\n3. Under <strong>Application Secrets</strong>, click <strong>Generate New Password</strong> and paste it to the <strong>Application Secret Password</strong> field below.\n4. Under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.\n5. Finally, click <strong>Save</strong> and then paste the <strong>Application ID</strong> below.'}),
+                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter "Mattermost - your-company-name" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter "your-mattermost-url/signup/office365/complete" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.'}),
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
                                             <ExternalLink
                                                 location='admin_console'
-                                                href='https://login.microsoftonline.com/'
+                                                href='https://entra.microsoft.com'
                                             >
                                                 {msg}
                                             </ExternalLink>
@@ -4636,7 +4636,7 @@ const AdminDefinition: AdminDefinitionType = {
                                         linkApps: (msg: string) => (
                                             <ExternalLink
                                                 location='admin_console'
-                                                href='https://apps.dev.microsoft.com'
+                                                href='https://entra.microsoft.com'
                                             >
                                                 {msg}
                                             </ExternalLink>
@@ -4918,7 +4918,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     value: Constants.GOOGLE_SERVICE,
                                     display_name: defineMessage({id: 'admin.openid.google', defaultMessage: 'Google Apps'}),
-                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com]</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter "Mattermost - your-company-name" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}),
+                                    help_text: defineMessage({id: 'admin.google.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com]</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter "Mattermost - your-company-name" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>"your-mattermost-url/signup/google/complete"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create</strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkAPI>Google People API</linkAPI> and click <strong>Enable</strong>.'}),
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
@@ -4950,14 +4950,14 @@ const AdminDefinition: AdminDefinitionType = {
                                 },
                                 {
                                     value: Constants.OFFICE365_SERVICE,
-                                    display_name: defineMessage({id: 'admin.openid.office365', defaultMessage: 'Office 365'}),
-                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft or Office 365 account. Make sure it`s the account on the same <linkTenant>tenant</linkTenant> that you would like users to log in with.\n2. Go to <linkApps>https://apps.dev.microsoft.com</linkApps>, click <strong>Go to Azure Portal</strong> > click <strong>New Registration</strong>.\n3. Use "Mattermost - your-company-name" as the <strong>Application Name</strong>, click <strong>Registration</strong>, paste <strong>Client ID</strong> and <strong>Tenant ID</strong> below.\n4. Click <strong>Authentication</strong>, under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.\n5. Click <strong>Certificates & secrets</strong>, Generate <strong>New client secret</strong> and paste secret value in <strong>Client Secret</strong> field below.'}),
+                                    display_name: defineMessage({id: 'admin.openid.office365', defaultMessage: 'Entra ID'}),
+                                    help_text: defineMessage({id: 'admin.office365.EnableMarkdownDesc', defaultMessage: '1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter "Mattermost - your-company-name" as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter "your-mattermost-url/signup/office365/complete" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.'}),
                                     help_text_markdown: false,
                                     help_text_values: {
                                         linkLogin: (msg: string) => (
                                             <ExternalLink
                                                 location='admin_console'
-                                                href='https://login.microsoftonline.com/'
+                                                href='https://entra.microsoft.com'
                                             >
                                                 {msg}
                                             </ExternalLink>
@@ -4973,7 +4973,7 @@ const AdminDefinition: AdminDefinitionType = {
                                         linkApps: (msg: string) => (
                                             <ExternalLink
                                                 location='admin_console'
-                                                href='https://apps.dev.microsoft.com'
+                                                href='https://entra.microsoft.com'
                                             >
                                                 {msg}
                                             </ExternalLink>
@@ -4984,7 +4984,7 @@ const AdminDefinition: AdminDefinitionType = {
                                 {
                                     value: Constants.OPENID_SERVICE,
                                     display_name: defineMessage({id: 'admin.oauth.openid', defaultMessage: 'OpenID Connect (Other)'}),
-                                    help_text: defineMessage({id: 'admin.openid.EnableMarkdownDesc', defaultMessage: 'Follow provider directions for creating an OpenID Application. Most OpenID Connect providers require authorization of all redirect URIs. In the appropriate field, enter your-mattermost-url/signup/openid/complete (example: http://domain.com/signup/openid/complete)'}),
+                                    help_text: defineMessage({id: 'admin.openid.EnableMarkdownDesc', defaultMessage: 'Follow provider directions for creating an OpenID Application. Most OpenID Connect providers require authorization of all redirect URIs. In the appropriate field, enter "your-mattermost-url/signup/openid/complete" (example: http://domain.com/signup/openid/complete)'}),
                                     help_text_markdown: false,
                                 },
                             ],
@@ -5073,7 +5073,7 @@ const AdminDefinition: AdminDefinitionType = {
                             type: 'text',
                             key: 'Office365Settings.DiscoveryEndpoint',
                             label: defineMessage({id: 'admin.openid.discoveryEndpointTitle', defaultMessage: 'Discovery Endpoint:'}),
-                            help_text: defineMessage({id: 'admin.office365.discoveryEndpointDesc', defaultMessage: 'The URL of the discovery document for OpenID Connect with Office 365.'}),
+                            help_text: defineMessage({id: 'admin.office365.discoveryEndpointDesc', defaultMessage: 'The URL of the discovery document for OpenID Connect with Entra ID.'}),
                             help_text_markdown: false,
                             dynamic_value: (value, config, state) => {
                                 if (state['Office365Settings.DirectoryId']) {
diff --git a/webapp/channels/src/components/admin_console/feature_discovery/features/openid.tsx b/webapp/channels/src/components/admin_console/feature_discovery/features/openid.tsx
index 0db1aafdbd..81a512f1fa 100644
--- a/webapp/channels/src/components/admin_console/feature_discovery/features/openid.tsx
+++ b/webapp/channels/src/components/admin_console/feature_discovery/features/openid.tsx
@@ -21,7 +21,7 @@ const OpenIDFeatureDiscovery: React.FC = () => {
             })}
             copy={defineMessage({
                 id: 'admin.openid_feature_discovery.copy',
-                defaultMessage: 'Use OpenID Connect for authentication and single sign-on (SSO) with any service that supports the OIDC specification such as Google, Office 365, Apple, Okta, OneLogin, and more.',
+                defaultMessage: 'Use OpenID Connect for authentication and single sign-on (SSO) with any service that supports the OIDC specification such as Google, Entra ID, Apple, Okta, OneLogin, and more.',
             })}
             learnMoreURL='https://docs.mattermost.com/cloud/cloud-administration/sso-openid-connect.html'
             featureDiscoveryImage={<SamlSVG/>}
diff --git a/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx b/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx
index eaf4d5be0e..fd297e0b11 100644
--- a/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx
+++ b/webapp/channels/src/components/admin_console/system_user_detail/system_user_detail.tsx
@@ -588,6 +588,12 @@ export function getUserAuthenticationTextField(intl: IntlShape, mfaEnabled: Prop
         let service;
         if (user.auth_service === Constants.LDAP_SERVICE || user.auth_service === Constants.SAML_SERVICE) {
             service = user.auth_service.toUpperCase();
+        } else if (user.auth_service === Constants.OFFICE365_SERVICE) {
+            // override service name office365 to text Entra ID
+            service = intl.formatMessage({
+                id: 'admin.oauth.office365',
+                defaultMessage: 'Entra ID',
+            });
         } else {
             service = toTitleCase(user.auth_service);
         }
diff --git a/webapp/channels/src/components/error_page/__snapshots__/error_message.test.tsx.snap b/webapp/channels/src/components/error_page/__snapshots__/error_message.test.tsx.snap
index b0459b1c1c..41e3e3bfa4 100644
--- a/webapp/channels/src/components/error_page/__snapshots__/error_message.test.tsx.snap
+++ b/webapp/channels/src/components/error_page/__snapshots__/error_message.test.tsx.snap
@@ -129,7 +129,7 @@ exports[`components/error_page/ErrorMessage should match snapshot, oauth_missing
           "link": <ErrorLink
             message={
               Object {
-                "defaultMessage": "Office 365",
+                "defaultMessage": "Entra ID",
                 "id": "error.oauth_missing_code.office365.link",
               }
             }
diff --git a/webapp/channels/src/components/error_page/error_message.tsx b/webapp/channels/src/components/error_page/error_message.tsx
index 7d7e8f553c..deb412651e 100644
--- a/webapp/channels/src/components/error_page/error_message.tsx
+++ b/webapp/channels/src/components/error_page/error_message.tsx
@@ -134,7 +134,7 @@ const ErrorMessage: React.FC<Props> = ({type, message, service, isGuest}: Props)
                                         url={'https://docs.mattermost.com/deployment/sso-office.html'}
                                         message={defineMessage({
                                             id: 'error.oauth_missing_code.office365.link',
-                                            defaultMessage: 'Office 365',
+                                            defaultMessage: 'Entra ID',
                                         })}
                                     />
                                 ),
diff --git a/webapp/channels/src/components/login/login.tsx b/webapp/channels/src/components/login/login.tsx
index 042b1cab3d..821f83440c 100644
--- a/webapp/channels/src/components/login/login.tsx
+++ b/webapp/channels/src/components/login/login.tsx
@@ -186,7 +186,7 @@ const Login = ({onCustomizeHeader}: LoginProps) => {
                 id: 'office365',
                 url,
                 icon: <LoginOffice365Icon/>,
-                label: formatMessage({id: 'login.office365', defaultMessage: 'Office 365'}),
+                label: formatMessage({id: 'login.office365', defaultMessage: 'Entra ID'}),
                 onClick: desktopExternalAuth(url),
             });
         }
diff --git a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
index 802a6dbcb0..69d503900c 100644
--- a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
+++ b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
@@ -412,7 +412,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
               icon={<LoginOffice365Icon />}
               id="office365"
               key="office365"
-              label="Office 365"
+              label="Entra ID"
               onClick={[Function]}
               url="/oauth/office365/signup"
             />
diff --git a/webapp/channels/src/components/signup/signup.tsx b/webapp/channels/src/components/signup/signup.tsx
index 7f90ed3b77..606ada3491 100644
--- a/webapp/channels/src/components/signup/signup.tsx
+++ b/webapp/channels/src/components/signup/signup.tsx
@@ -201,7 +201,7 @@ const Signup = ({onCustomizeHeader}: SignupProps) => {
                 id: 'office365',
                 url,
                 icon: <LoginOffice365Icon/>,
-                label: formatMessage({id: 'login.office365', defaultMessage: 'Office 365'}),
+                label: formatMessage({id: 'login.office365', defaultMessage: 'Entra ID'}),
                 onClick: desktopExternalAuth(url),
             });
         }
diff --git a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
index b72e0acd00..2c41b77bbb 100644
--- a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
+++ b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
@@ -626,7 +626,7 @@ export class UserSettingsGeneralTab extends PureComponent<Props, State> {
                         <div className='setting-list__hint pb-3'>
                             <FormattedMessage
                                 id='user.settings.general.emailOffice365CantUpdate'
-                                defaultMessage='Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.'
+                                defaultMessage='Login occurs through Entra ID. Email cannot be updated. Email address used for notifications is {email}.'
                                 values={{
                                     email: this.state.originalEmail,
                                 }}
@@ -735,7 +735,7 @@ export class UserSettingsGeneralTab extends PureComponent<Props, State> {
             describe = (
                 <FormattedMessage
                     id='user.settings.general.loginOffice365'
-                    defaultMessage='Login done through Office 365 ({email})'
+                    defaultMessage='Login done through Entra ID ({email})'
                     values={{
                         email: this.state.originalEmail,
                     }}
diff --git a/webapp/channels/src/components/user_settings/security/user_settings_security.tsx b/webapp/channels/src/components/user_settings/security/user_settings_security.tsx
index 017dab485b..fe4b2ce472 100644
--- a/webapp/channels/src/components/user_settings/security/user_settings_security.tsx
+++ b/webapp/channels/src/components/user_settings/security/user_settings_security.tsx
@@ -407,7 +407,7 @@ export class SecurityTab extends React.PureComponent<Props, State> {
                         <div className='pb-3'>
                             <FormattedMessage
                                 id='user.settings.security.passwordOffice365CantUpdate'
-                                defaultMessage='Login occurs through Office 365. Password cannot be updated.'
+                                defaultMessage='Login occurs through Entra ID. Password cannot be updated.'
                             />
                         </div>
                     </div>,
@@ -495,7 +495,7 @@ export class SecurityTab extends React.PureComponent<Props, State> {
             describe = (
                 <FormattedMessage
                     id='user.settings.security.loginOffice365'
-                    defaultMessage='Login done through Office 365'
+                    defaultMessage='Login done through Entra ID'
                 />
             );
         }
@@ -597,7 +597,7 @@ export class SecurityTab extends React.PureComponent<Props, State> {
                             >
                                 <FormattedMessage
                                     id='user.settings.security.switchOffice365'
-                                    defaultMessage='Switch to Using Office 365 SSO'
+                                    defaultMessage='Switch to Using Entra ID SSO'
                                 />
                             </Link>
                             <br/>
@@ -764,7 +764,7 @@ export class SecurityTab extends React.PureComponent<Props, State> {
             describe = (
                 <FormattedMessage
                     id='user.settings.security.office365'
-                    defaultMessage='Office 365'
+                    defaultMessage='Entra ID'
                 />
             );
         } else if (
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 98700d8c5d..a128d74533 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -1052,7 +1052,7 @@
   "admin.google.clientSecretExample": "E.g.: \"H8sz0Az-dDs2p15-7QzD231\"",
   "admin.google.clientSecretTitle": "Client Secret:",
   "admin.google.discoveryEndpointDesc": "The URL of the discovery document for OpenID Connect with Google.",
-  "admin.google.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter \"Mattermost - your-company-name\" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>your-mattermost-url/signup/google/complete</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create<strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkApi>Google People API</linkApi> and click <strong>Enable</strong>.",
+  "admin.google.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Google account.\n2. Go to <linkConsole>https://console.developers.google.com</linkConsole>, click <strong>Credentials</strong> in the left hand side.\n 3. Under the <strong>Credentials</strong> header, click <strong>Create credentials</strong>, choose <strong>OAuth client ID</strong> and select <strong>Web Application</strong>.\n 4. Enter \"Mattermost - your-company-name\" as the <strong>Name</strong>.\n 5. Under <strong>Authorized redirect URIs</strong> enter <strong>\"your-mattermost-url/signup/google/complete\"</strong> (example: http://localhost:8065/signup/google/complete). Click <strong>Create<strong>.\n 6. Paste the <strong>Client ID</strong> and <strong>Client Secret</strong> to the fields below, then click <strong>Save</strong>.\n 7. Go to the <linkApi>Google People API</linkApi> and click <strong>Enable</strong>.",
   "admin.google.tokenTitle": "Token Endpoint:",
   "admin.google.userTitle": "User API Endpoint:",
   "admin.group_settings.filters.isConfigured": "Is Configured",
@@ -1512,7 +1512,7 @@
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",
   "admin.oauth.off": "Do not allow sign-in via an OAuth 2.0 provider",
-  "admin.oauth.office365": "Office 365",
+  "admin.oauth.office365": "Entra ID",
   "admin.oauth.openid": "OpenID Connect (Other)",
   "admin.oauth.providerDescription": "When true, Mattermost can act as an OAuth 2.0 service provider allowing Mattermost to authorize API requests from external applications. See <link>documentation</link> to learn more.",
   "admin.oauth.providerTitle": "Enable OAuth 2.0 Service Provider: ",
@@ -1526,13 +1526,13 @@
   "admin.office365.directoryIdDescription": "The Directory (tenant) ID you received when registering your application with Microsoft.",
   "admin.office365.directoryIdExample": "E.g.: \"adf3sfa2-ag3f-sn4n-ids0-sh1hdax192qq\"",
   "admin.office365.directoryIdTitle": "Directory (tenant) ID:",
-  "admin.office365.discoveryEndpointDesc": "The URL of the discovery document for OpenID Connect with Office 365.",
-  "admin.office365.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Microsoft or Office 365 account. Make sure it`s the account on the same <linkTenant>tenant</linkTenant> that you would like users to log in with.\n2. Go to <linkApps>https://apps.dev.microsoft.com</linkApps>, click <strong>Go to Azure Portal</strong> > click <strong>New Registration<strong>.\n3. Use \"Mattermost - your-company-name\" as the <strong>Application Name</strong> click <strong>Registration</strong>, paste <strong>Client ID</strong> and <strong>Tenant ID</strong> below.\n4. Click <strong>Authentication</strong>, under <strong>Platforms</strong>, click <strong>Add Platform</strong>, choose <strong>Web</strong> and enter <strong>your-mattermost-url/signup/office365/complete</strong> (example: http://localhost:8065/signup/office365/complete) under <strong>Redirect URIs</strong>. Also uncheck <strong>Allow Implicit Flow</strong>.\n5. Click <strong>Certificates & secrets</strong>, Generate <strong>New client secret</strong> and paste secret value in <strong>Client Secret</strong> field below.",
+  "admin.office365.discoveryEndpointDesc": "The URL of the discovery document for OpenID Connect with Entra ID.",
+  "admin.office365.EnableMarkdownDesc": "1. <linkLogin>Log in</linkLogin> to your Microsoft account. \n2. In Microsoft, go to <strong>Applications</strong> and <strong>App Registrations</strong> in the left pane.\n3. Select <strong>New registration</strong>, then enter <Mattermost - your-company-name> as the <strong>Application Name</strong>. \n4. Under <strong>Redirect URI</strong>, select <strong>Web</strong>, and enter \"your-mattermost-url/signup/office365/complete\" as the <strong>Redirect URI</strong>. Select <strong>Register</strong>.\n5. Copy the Microsoft <strong>Application (client) ID</strong> value, and paste it below as the <strong>Client ID</strong> value. \n6. Copy the Microsoft <strong>Directory (tenant) ID</strong> value, and paste it below as the <strong>Directory (tenant) ID</strong> value. \n7. In Microsoft, create a new client secret. Copy the resulting client secret value, and paste it below as the <strong>Client Secret</strong> value. Select <strong>Save</strong>.",
   "admin.office365.tokenTitle": "Token Endpoint:",
   "admin.office365.userTitle": "User API Endpoint:",
   "admin.openid_custom_feature_discovery.copy": "Use OpenID Connect for authentication and single sign-on (SSO) with any service that supports the OIDC specification such as Apple, Okta, OneLogin, and more.",
   "admin.openid_custom_feature_discovery.title": "Integrate OpenID Connect with Mattermost Professional",
-  "admin.openid_feature_discovery.copy": "Use OpenID Connect for authentication and single sign-on (SSO) with any service that supports the OIDC specification such as Google, Office 365, Apple, Okta, OneLogin, and more.",
+  "admin.openid_feature_discovery.copy": "Use OpenID Connect for authentication and single sign-on (SSO) with any service that supports the OIDC specification such as Google, Entra ID, Apple, Okta, OneLogin, and more.",
   "admin.openid_feature_discovery.title": "Integrate OpenID Connect with Mattermost Professional",
   "admin.openid.buttonColorDesc": "Specify the color of the OpenID login button for white labeling purposes. Use a hex code with a #-sign before the code.",
   "admin.openid.buttonColorTitle": "Button Color:",
@@ -1548,11 +1548,11 @@
   "admin.openid.discovery.placeholder": "https://id.mydomain.com/.well-known/openid-configuration",
   "admin.openid.discoveryEndpointDesc": "Enter the URL of the discovery document of the OpenID Connect provider you want to connect with.",
   "admin.openid.discoveryEndpointTitle": "Discovery Endpoint:",
-  "admin.openid.EnableMarkdownDesc": "Follow provider directions for creating an OpenID Application. Most OpenID Connect providers require authorization of all redirect URIs. In the appropriate field, enter your-mattermost-url/signup/openid/complete (example: http://domain.com/signup/openid/complete)",
+  "admin.openid.EnableMarkdownDesc": "Follow provider directions for creating an OpenID Application. Most OpenID Connect providers require authorization of all redirect URIs. In the appropriate field, enter \"your-mattermost-url/signup/openid/complete\" (example: http://domain.com/signup/openid/complete)",
   "admin.openid.gitlab": "GitLab",
   "admin.openid.google": "Google Apps",
   "admin.openid.off": "Do not allow sign-in via an OpenID provider.",
-  "admin.openid.office365": "Office 365",
+  "admin.openid.office365": "Entra ID",
   "admin.openid.select": "Select service provider:",
   "admin.openIdConvert.help": "Learn more",
   "admin.openIdConvert.message": "You can now convert your OAuth2.0 configuration to OpenID Connect.",
@@ -3611,7 +3611,7 @@
   "error.oauth_missing_code.google": "For {link} make sure your administrator enabled the Google+ API.",
   "error.oauth_missing_code.google.link": "Google Apps",
   "error.oauth_missing_code.office365": "For {link} make sure the administrator of your Microsoft organization has enabled the Mattermost app.",
-  "error.oauth_missing_code.office365.link": "Office 365",
+  "error.oauth_missing_code.office365.link": "Entra ID",
   "error.oauth_missing_code.title": "Mattermost Needs Your Help",
   "error.plugin_not_found.desc": "The plugin you are looking for does not exist.",
   "error.plugin_not_found.title": "Plugin Not Found",
@@ -4100,7 +4100,7 @@
   "login.noPassword": "Please enter your password",
   "login.noUsername": "Please enter your username",
   "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}",
-  "login.office365": "Office 365",
+  "login.office365": "Entra ID",
   "login.openid": "Open ID",
   "login.or": "or log in with",
   "login.passwordChanged": " Password updated successfully",
@@ -5441,7 +5441,7 @@
   "user.settings.general.emailHelp3": "Email is used for sign-in, notifications, and password reset.",
   "user.settings.general.emailLdapCantUpdate": "Login occurs through AD/LDAP. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailMatch": "The new emails you entered do not match.",
-  "user.settings.general.emailOffice365CantUpdate": "Login occurs through Office 365. Email cannot be updated. Email address used for notifications is {email}.",
+  "user.settings.general.emailOffice365CantUpdate": "Login occurs through Entra ID. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailOpenIdCantUpdate": "Login occurs through OpenID Connect. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emailSamlCantUpdate": "Login occurs through SAML. Email cannot be updated. Email address used for notifications is {email}.",
   "user.settings.general.emptyName": "Click 'Edit' to add your full name",
@@ -5458,7 +5458,7 @@
   "user.settings.general.loginGitlab": "Login done through GitLab ({email})",
   "user.settings.general.loginGoogle": "Login done through Google ({email})",
   "user.settings.general.loginLdap": "Login done through AD/LDAP ({email})",
-  "user.settings.general.loginOffice365": "Login done through Office 365 ({email})",
+  "user.settings.general.loginOffice365": "Login done through Entra ID ({email})",
   "user.settings.general.loginSaml": "Login done through SAML ({email})",
   "user.settings.general.mobile.emptyName": "Click to add your full name",
   "user.settings.general.mobile.emptyNickname": "Click to add a nickname",
@@ -5615,7 +5615,7 @@
   "user.settings.security.loginGitlab": "Login done through GitLab",
   "user.settings.security.loginGoogle": "Login done through Google Apps",
   "user.settings.security.loginLdap": "Login done through AD/LDAP",
-  "user.settings.security.loginOffice365": "Login done through Office 365",
+  "user.settings.security.loginOffice365": "Login done through Entra ID",
   "user.settings.security.loginSaml": "Login done through SAML",
   "user.settings.security.logoutActiveSessions": "View and Log Out of Active Sessions",
   "user.settings.security.logoutActiveSessions.icon": "Active Sessions Icon",
@@ -5625,7 +5625,7 @@
   "user.settings.security.oauthApps": "OAuth 2.0 Applications",
   "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
   "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
-  "user.settings.security.office365": "Office 365",
+  "user.settings.security.office365": "Entra ID",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
   "user.settings.security.openid": "OpenID",
   "user.settings.security.password": "Password",
@@ -5650,7 +5650,7 @@
   "user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.",
   "user.settings.security.passwordMatchError": "The new passwords you entered do not match.",
   "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
-  "user.settings.security.passwordOffice365CantUpdate": "Login occurs through Office 365. Password cannot be updated.",
+  "user.settings.security.passwordOffice365CantUpdate": "Login occurs through Entra ID. Password cannot be updated.",
   "user.settings.security.passwordSamlCantUpdate": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
   "user.settings.security.retypePassword": "Retype New Password",
   "user.settings.security.saml": "SAML",
@@ -5658,7 +5658,7 @@
   "user.settings.security.switchGitlab": "Switch to Using GitLab SSO",
   "user.settings.security.switchGoogle": "Switch to Using Google SSO",
   "user.settings.security.switchLdap": "Switch to Using AD/LDAP",
-  "user.settings.security.switchOffice365": "Switch to Using Office 365 SSO",
+  "user.settings.security.switchOffice365": "Switch to Using Entra ID SSO",
   "user.settings.security.switchOpenId": "Switch to Using OpenID SSO",
   "user.settings.security.switchSaml": "Switch to Using SAML SSO",
   "user.settings.security.title": "Security Settings",