diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index f0d4d85949..daf32e27cd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -1106,6 +1106,10 @@ public class FragmentOAuth extends FragmentBase {
                 if (ex.getMessage() != null &&
                         ex.getMessage().contains("535 5.7.3 Authentication unsuccessful"))
                     tvOfficeAuthHint.setText(R.string.title_setup_office_auth_5_7_3);
+                else if (ex.getMessage() != null &&
+                        ex.getMessage().contains("SmtpClientAuthentication is disabled"))
+                    // 535 5.7.139 Authentication unsuccessful, SmtpClientAuthentication is disabled for the Tenant
+                    tvOfficeAuthHint.setText(R.string.title_setup_office_auth_5_7_139);
                 else
                     tvOfficeAuthHint.setText(R.string.title_setup_office_auth);
                 tvOfficeAuthHint.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd7fd8f1eb..c4e0f0cd4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -251,6 +251,7 @@
     <string name="title_setup_gmail_password">I want to authorize an account with a password instead of an on-device account</string>
     <string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>
     <string name="title_setup_office_auth_5_7_3">Please try the \'Other provider\' quick setup wizard.</string>
+    <string name="title_setup_office_auth_5_7_139">Please try the \'Outlook/Hotmail/Live\' quick setup wizard.</string>
     <string name="title_setup_oauth_rationale">Authorize access to your %1$s account</string>
     <string name="title_setup_oauth_update">Authorize an existing account again (otherwise create a new account)</string>
     <string name="title_setup_oauth_updated">Account authorization was updated</string>