diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bbb354c907b4e558e9bfadbbd6db819e48b2bb4a..5b815edc288055c74f1d905b870d90fe3c51e1f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"/>
 
     <queries>
         <package android:name="com.nextcloud.client" />
@@ -183,11 +184,13 @@
             android:enabled="true"
             android:exported="true"/>
 
-        <receiver android:name=".receiver.AccountRemoveReceiver"
+        <receiver
+            android:name=".receiver.AccountRemoveReceiver"
+            android:exported="true"
             android:enabled="true"
-            android:exported="true">
+            android:permission="foundation.e.accountmanager.permission.ACCOUNT_EVENTS">
             <intent-filter>
-                <action android:name="android.accounts.action.ACCOUNT_REMOVED"/>
+                <action android:name="foundation.e.accountmanager.action.ACCOUNT_REMOVED"/>
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java b/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java
index 480a7d1a7bd7ac42f3668b1b2f13da89ce4bed62..4c6d837d4e20ff77425f0eb7b913a2028a95be3f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java
@@ -39,13 +39,13 @@ public class AccountRemoveReceiver extends BroadcastReceiver {
 
     private static final String TAG = AccountRemoveReceiver.class.getSimpleName();
     private static final String[] SUPPORTED_ACCOUNT_TYPES = {"e.foundation.webdav.eelo"};
-    private static final String ACTION_ACCOUNT_REMOVE = "android.accounts.action.ACCOUNT_REMOVED";
+    private static final String ACTION_ACCOUNT_REMOVED = "foundation.e.accountmanager.action.ACCOUNT_REMOVED";
 
     private final ExecutorService executor = Executors.newCachedThreadPool();
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (!ACTION_ACCOUNT_REMOVE.equals(intent.getAction())) {
+        if (!ACTION_ACCOUNT_REMOVED.equals(intent.getAction())) {
             return;
         }