diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c379c6af33ba43df1058b9bca6b26b47e567e1f6..f7cc61d16129220498cef4f6adf50717e4c6e1ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,10 +29,6 @@
     <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
 
-    <!-- permission to use to be notified about account being added -->
-    <permission android:name="foundation.e.accountmanager.permission.ADD_ACCOUNT"
-        android:protectionLevel="signature" />
-
     <!-- permission for broadcast related to account changes event (added/removed) -->
     <permission
         android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt b/app/src/main/kotlin/at/bitfire/davdroid/AccountSyncHelper.kt
similarity index 51%
rename from app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
rename to app/src/main/kotlin/at/bitfire/davdroid/AccountSyncHelper.kt
index 2a84249a125f7dd67b382094fdc4198bc0815aa9..aa8143c308f2e7f151e61b261ad9e0ee86102b6d 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/AccountSyncHelper.kt
@@ -17,34 +17,35 @@
 
 package at.bitfire.davdroid
 
-import android.content.ComponentName
+import android.accounts.AccountManager
 import android.content.Context
 import android.content.Intent
 
-object MailAccountSyncHelper {
+object AccountSyncHelper {
 
-    private const val MAIL_PACKAGE = "foundation.e.mail"
-    private const val MAIL_RECEIVER_CLASS = "com.fsck.k9.account.AccountSyncReceiver"
-    private const val ACTION_PREFIX = "foundation.e.accountmanager.account."
-    private const val ACCOUNT_EVENTS_PERMISSION = "foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
+    private const val ACTION_PREFIX = "foundation.e.accountmanager.action"
+    const val ACCOUNT_EVENTS_PERMISSION = "foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
+    const val ACTION_ACCOUNT_REMOVED = "$ACTION_PREFIX.ACCOUNT_REMOVED"
+    const val ACTION_ACCOUNT_ADDED = "$ACTION_PREFIX.ACCOUNT_ADDED"
 
-    fun syncMailAccounts(applicationContext: Context?) {
-        val intent = getIntent()
-        intent.action = ACTION_PREFIX + "create"
-        applicationContext?.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
+    fun notifyAccountAdded(context: Context, accountName: String) {
+        val intent = Intent(ACTION_ACCOUNT_ADDED).apply {
+            addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+            val accountType = context.getString(R.string.eelo_account_type)
+            putExtra(AccountManager.KEY_ACCOUNT_NAME, accountName)
+            putExtra(AccountManager.KEY_ACCOUNT_TYPE, accountType)
+        }
+        context.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
     }
 
     fun notifyAccountRemoved(context: Context, accountRemovedIntent: Intent) {
-        val intent = getIntent()
-        intent.action = ACTION_PREFIX + "removed"
-        intent.putExtras(accountRemovedIntent)
-        context.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
+        context.sendBroadcast(
+            Intent(ACTION_ACCOUNT_REMOVED).apply {
+                addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                putExtras(accountRemovedIntent)
+            },
+            ACCOUNT_EVENTS_PERMISSION
+        )
     }
 
-    private fun getIntent() : Intent {
-        val intent = Intent()
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-        intent.component = ComponentName(MAIL_PACKAGE, MAIL_RECEIVER_CLASS)
-        return intent
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt b/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
index 5ca9c8fb66b3f7bac94a325da5650e0a37fc2ce9..b1d6726a285e54277aa7ee211ec8e4b0faba94e0 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
@@ -20,7 +20,7 @@ import android.accounts.AccountManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import at.bitfire.davdroid.MailAccountSyncHelper
+import at.bitfire.davdroid.AccountSyncHelper
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.syncadapter.AccountUtils
 import at.bitfire.davdroid.ui.signout.OpenIdEndSessionActivity
@@ -44,7 +44,7 @@ class AccountRemovedReceiver : BroadcastReceiver() {
             context = context,
             accountName = accountName
         )
-        MailAccountSyncHelper.notifyAccountRemoved(context.applicationContext, intent)
+        AccountSyncHelper.notifyAccountRemoved(context.applicationContext, intent)
     }
 
     private fun clearOidcSession(
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/syncadapter/MailSyncer.kt b/app/src/main/kotlin/at/bitfire/davdroid/syncadapter/MailSyncer.kt
index 69df9f05dd769fc45ac5ea4781d7a708c343ec8b..017ffd49fc3cfcc157494a16bef1d8c01ffcf856 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/syncadapter/MailSyncer.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/syncadapter/MailSyncer.kt
@@ -20,7 +20,7 @@ import android.accounts.Account
 import android.content.ContentProviderClient
 import android.content.Context
 import android.content.SyncResult
-import at.bitfire.davdroid.MailAccountSyncHelper
+import at.bitfire.davdroid.AccountSyncHelper
 import at.bitfire.davdroid.network.HttpClient
 
 class MailSyncer (context: Context): Syncer(context) {
@@ -32,6 +32,6 @@ class MailSyncer (context: Context): Syncer(context) {
         provider: ContentProviderClient,
         syncResult: SyncResult
     ) {
-        MailAccountSyncHelper.syncMailAccounts(context.applicationContext)
+        AccountSyncHelper.notifyAccountAdded(context.applicationContext, account.name)
     }
 }
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/account/SettingsActivity.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/account/SettingsActivity.kt
index b04529e156de36d82e7adfa7a27ec75ded7ba4cc..d8233d19236945bf967b85b1c80dcca20c4415fe 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/ui/account/SettingsActivity.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/account/SettingsActivity.kt
@@ -32,7 +32,7 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceGroup
 import androidx.preference.SwitchPreferenceCompat
 import at.bitfire.davdroid.InvalidAccountException
-import at.bitfire.davdroid.MailAccountSyncHelper
+import at.bitfire.davdroid.AccountSyncHelper
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.db.Credentials
 import at.bitfire.davdroid.log.Logger
@@ -574,7 +574,7 @@ class SettingsActivity: AppCompatActivity() {
             accountSettings?.credentials(credentials)
             clearOwnCloudData()
             reload()
-            MailAccountSyncHelper.syncMailAccounts(getApplication())
+            AccountSyncHelper.notifyAccountAdded(getApplication(), account.name)
         }
 
         private fun clearOwnCloudData() {
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index d3a08789089e725570156e5dea4bf61b0dd5bd25..8937aad8fbf62e8030a92ca34250e89c9cbd9774 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -32,7 +32,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.viewModelScope
 import at.bitfire.davdroid.Constants
 import at.bitfire.davdroid.InvalidAccountException
-import at.bitfire.davdroid.MailAccountSyncHelper
+import at.bitfire.davdroid.AccountSyncHelper
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.databinding.LoginAccountDetailsBinding
 import at.bitfire.davdroid.db.AppDatabase
@@ -202,7 +202,7 @@ class AccountDetailsFragment : Fragment() {
                                 MurenaSsoMigrationPreferences.isSsoMigrationRunning(requireContext())
 
                             if (isSsoMigrationRunning) {
-                                handlePostMurenaSsoMigrationOperations()
+                                handlePostMurenaSsoMigrationOperations(name)
                             } else {
                                 notifyListeners(name)
                             }
@@ -242,7 +242,7 @@ class AccountDetailsFragment : Fragment() {
         return account.name.substringBefore("@") == accountName.substringBefore("@")
     }
 
-    private fun handlePostMurenaSsoMigrationOperations() {
+    private fun handlePostMurenaSsoMigrationOperations(name: String) {
         val authState = requireActivity().intent.getStringExtra(LoginActivity.AUTH_STATE)
         val isMigratedToMurenaSso = !authState.isNullOrBlank()
 
@@ -251,12 +251,12 @@ class AccountDetailsFragment : Fragment() {
             MurenaSsoMigrationPreferences.updateSsoMigrationStatus(requireContext(), Completed)
             Logger.log.info("Murena SSO migration is complete.")
 
-            syncMailToUseOAuth()
+            syncMailToUseOAuth(name)
         }
     }
 
-    private fun syncMailToUseOAuth() {
-        MailAccountSyncHelper.syncMailAccounts(requireContext())
+    private fun syncMailToUseOAuth(name: String) {
+        AccountSyncHelper.notifyAccountAdded(requireContext(), name)
     }
 
     private fun stopMurenaSsoMigrationService() {
@@ -265,12 +265,7 @@ class AccountDetailsFragment : Fragment() {
     }
 
     private fun notifyListeners(name: String) {
-        val intent = Intent("foundation.e.accountmanager.action.ACCOUNT_ADDED")
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-
-        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
-        intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
-        requireActivity().sendBroadcast(intent, "foundation.e.accountmanager.permission.ADD_ACCOUNT")
+        AccountSyncHelper.notifyAccountAdded(requireContext(), name)
     }