diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 391b85b266..fb34dee3e7 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -21,6 +21,8 @@ package eu.faircode.email;
 
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
+import static eu.faircode.email.ServiceAuthenticator.AUTH_TYPE_PASSWORD;
+
 import android.app.AlarmManager;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -1415,7 +1417,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                         lastStillHere.setTime(0);
                     } catch (Throwable ex) {
                         // Immediately report auth errors
-                        if (ex instanceof AuthenticationFailedException) {
+                        if (account.auth_type == AUTH_TYPE_PASSWORD &&
+                                ex instanceof AuthenticationFailedException) {
                             if (ConnectionHelper.isIoError(ex)) {
                                 if (!BuildConfig.PLAY_STORE_RELEASE)
                                     Log.e(ex);