diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 223df3a14d..af4e0bd7b6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -451,7 +451,7 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
                                         .putExtra("name", provider.description)
                                         .putExtra("privacy", provider.oauth.privacy)
                                         .putExtra("askAccount", provider.oauth.askAccount)
-                                        .putExtra("askTenant", provider.oauth.askTenant())
+                                        .putExtra("askTenant", (provider.graph == null && provider.oauth.askTenant()))
                                         .putExtra("pop", provider.pop != null));
                         // https://developers.google.com/identity/branding-guidelines
                         int resid = res.getIdentifier("provider_" + provider.id, "drawable", pkg);