diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 0cfa2a3e52..f20a9b0595 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -522,6 +522,34 @@ public class EmailService implements AutoCloseable {
             } else
                 throw ex;
         } catch (MessagingException ex) {
+            /*
+                javax.mail.MessagingException: FY1 BAD Command Error. 10;
+                  nested exception is:
+                    com.sun.mail.iap.BadCommandException: FY1 BAD Command Error. 10
+                javax.mail.MessagingException: FY1 BAD Command Error. 10;
+                  nested exception is:
+                    com.sun.mail.iap.BadCommandException: FY1 BAD Command Error. 10
+                    at com.sun.mail.imap.IMAPStore.protocolConnect(SourceFile:40)
+                    at javax.mail.Service.connect(SourceFile:31)
+                    at eu.faircode.email.EmailService._connect(SourceFile:31)
+                    at eu.faircode.email.EmailService.connect(SourceFile:99)
+                    at eu.faircode.email.EmailService.connect(SourceFile:40)
+                    at eu.faircode.email.EmailService.connect(SourceFile:4)
+                    at eu.faircode.email.ServiceSynchronize.monitorAccount(SourceFile:40)
+                    at eu.faircode.email.ServiceSynchronize.access$1100(SourceFile:1)
+                    at eu.faircode.email.ServiceSynchronize$4$2.run(SourceFile:1)
+                    at java.lang.Thread.run(Thread.java:919)
+                Caused by: com.sun.mail.iap.BadCommandException: FY1 BAD Command Error. 10
+                    at com.sun.mail.iap.Protocol.handleResult(SourceFile:7)
+                    at com.sun.mail.imap.protocol.IMAPProtocol.handleLoginResult(SourceFile:4)
+                    at com.sun.mail.imap.protocol.IMAPProtocol.authoauth2(SourceFile:36)
+                    at com.sun.mail.imap.IMAPStore.authenticate(SourceFile:24)
+                    at com.sun.mail.imap.IMAPStore.login(SourceFile:22)
+                    at com.sun.mail.imap.IMAPStore.protocolConnect(SourceFile:24)
+             */
+            if (ex.getMessage() != null && ex.getMessage().contains("Command Error. 10"))
+                throw new AuthenticationFailedException(context.getString(R.string.title_service_error10), ex);
+
             if (purpose == PURPOSE_CHECK) {
                 if (port == 995 && !("pop3".equals(protocol) || "pop3s".equals(protocol)))
                     throw new MessagingException(context.getString(R.string.title_service_port), ex);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a772e1ca11..80beb9c24e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1104,6 +1104,7 @@
     <string name="title_service_token">The Android account manager could be blocked by a VPN, firewall, ad blocker, etc., preventing it from obtaining an access token</string>
     <string name="title_service_port">Please double check the port number</string>
     <string name="title_service_protocol">Please double check the protocol (SSL/TLS or STARTTLS)</string>
+    <string name="title_service_error10">This account needs to be authenticated again, which can be done via the quick setup wizard</string>
 
     <string name="title_advanced_browse">Browse messages on the server</string>
     <string name="title_advanced_expand_read">Mark messages read on expanding</string>