diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7f29928d1..bbfe445b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -438,7 +438,7 @@
         <service
             android:name=".service.ImapAuthenticatorService"
             android:exported="true"
-            android:enabled="false"
+            android:enabled="true"
             >
             <intent-filter>
                 <action
@@ -566,6 +566,20 @@
                 android:resource="@xml/authenticator_alternate"
                 />
         </service>
+        <service
+            android:name=".service.ImapAuthenticatorService"
+            android:exported="true"
+            android:enabled="true"
+            >
+            <intent-filter>
+                <action
+                    android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator_imap"
+                />
+        </service>
 
         <service
             android:name=".service.LegacyImapAuthenticatorService"