diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index efc8d493d0..5241c1ac97 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -305,8 +305,11 @@ public class EmailProvider implements Parcelable {
                         provider.pop.port = getAttributeIntValue(xml, "port", 0);
                         provider.pop.starttls = getAttributeBooleanValue(xml, "starttls", false);
                     } else if ("oauth".equals(name)) {
+                        String val = xml.getAttributeValue(null, "enabled");
+                        boolean enabled = ("debug".equals(val) ? BuildConfig.DEBUG : Boolean.parseBoolean(val));
+
                         provider.oauth = new OAuth();
-                        provider.oauth.enabled = getAttributeBooleanValue(xml, "enabled", false);
+                        provider.oauth.enabled = enabled;
                         provider.oauth.askAccount = getAttributeBooleanValue(xml, "askAccount", false);
                         provider.oauth.clientId = xml.getAttributeValue(null, "clientId");
                         provider.oauth.clientSecret = xml.getAttributeValue(null, "clientSecret");
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 7b12099b8e..6616c6bb60 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -467,7 +467,7 @@
             askAccount="true"
             authorizationEndpoint="https://api.fastmail.com/oauth/authorize"
             clientId="353941ae"
-            enabled="false"
+            enabled="debug"
             privacy="https://www.fastmail.com/features/privacy/"
             redirectUri="http://localhost:49491/"
             scopes="https://www.fastmail.com/dev/protocol-imap,https://www.fastmail.com/dev/protocol-smtp,https://www.fastmail.com/dev/protocol-pop"