diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 39ed3028..064a255c 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -240,13 +240,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="org.microg.gms.auth.AskPermissionActivity"
-            android:excludeFromRecents="true"
-            android:exported="true"
-            android:process=":ui"
-            android:theme="@style/Theme.AppCompat.DayNight.Dialog" />
-
         <service
             android:name="com.google.android.gms.auth.GetToken"
             android:exported="true" />
diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
index 57379c87..324ce4dd 100644
--- a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
@@ -57,8 +57,12 @@ public class GServicesProvider extends ContentProvider {
     public boolean onCreate() {
         databaseHelper = new DatabaseHelper(getContext());
 
-        getContext().sendOrderedBroadcast(new Intent(getContext(), org.microg.gms.checkin.TriggerReceiver.class), null);
-        getContext().sendBroadcast(new Intent(org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT, null, getContext(), org.microg.gms.gcm.TriggerReceiver.class));
+        if (CheckinPrefs.get(getContext()).isEnabled()) {
+            getContext().sendOrderedBroadcast(new Intent(getContext(), org.microg.gms.checkin.TriggerReceiver.class), null);
+        }
+        if (GcmPrefs.get(getContext()).isEnabled()) {
+            getContext().sendBroadcast(new Intent(org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT, null, getContext(), org.microg.gms.gcm.TriggerReceiver.class));
+        }
 
         return true;
     }