diff --git a/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
index 5d5cad784c..70faaa7f56 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
@@ -29,6 +29,7 @@
 public class LocationSettingsActivity extends Activity {
 
     private final static String ACCOUNT_NAME = "account_name";
+    private final static String ACCOUNT_NAME_V2 = "accountName";
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -38,8 +39,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 Intent intent = new Intent(this, MainActivity.class);
                 intent.setAction(ACTION_LOCATION_SHARING);
                 Bundle extras = getIntent().getExtras();
-                if (extras != null && extras.containsKey(ACCOUNT_NAME)) {
-                    intent.putExtra(EXTRA_ACCOUNT_NAME, extras.getString(ACCOUNT_NAME));
+                if (extras != null) {
+                    String accountName = null;
+                    if (extras.containsKey(ACCOUNT_NAME)) {
+                        accountName = extras.getString(ACCOUNT_NAME);
+                    }
+                    else if (extras.containsKey(ACCOUNT_NAME_V2)) {
+                        accountName = extras.getString(ACCOUNT_NAME_V2);
+                    }
+                    if (accountName != null) {
+                        intent.putExtra(EXTRA_ACCOUNT_NAME, accountName);
+                    }
                 }
                 startActivity(intent);
             }