diff --git a/extern/GmsApi b/extern/GmsApi
index fbe903fb..8d39059c 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit fbe903fbcbcc27af3579c9b7b35c40b105224a01
+Subproject commit 8d39059ce60908519a4642562c848d9da063e710
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index d43ace4e..9fa1b31f 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
         android:name="com.google.android.c2dm.permission.RECEIVE"
         android:label="@string/perm_c2dm_receive_label"
         android:permissionGroup="android.permission-group.NETWORK"
-        android:protectionLevel="dangerous"/>
+        android:protectionLevel="normal"/>
     <permission
         android:name="com.google.android.c2dm.permission.SEND"
         android:label="@string/perm_c2dm_send_label"
@@ -275,6 +275,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name="org.microg.gms.auth.login.LoginActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -286,6 +287,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name="org.microg.gms.auth.AskPermissionActivity"
             android:excludeFromRecents="true"
@@ -300,6 +302,11 @@
             android:name=".auth.TokenActivity"
             android:exported="true"/>
 
+        <provider
+            android:name="org.microg.gms.auth.AccountContentProvider"
+            android:authorities="com.google.android.gms.auth.accounts"
+            android:exported="true"/>
+
         <!-- Games -->
 
         <service
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java b/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java
new file mode 100644
index 00000000..bbd5b75a
--- /dev/null
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.microg.gms.auth;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import com.google.android.gms.R;
+
+public class AccountContentProvider extends ContentProvider {
+    private static final String TAG = "GmsAuthProvider";
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public Bundle call(String method, String arg, Bundle extras) {
+        // FIXME: Restrict access!
+        if ("get_accounts".equals(method) && getContext().getString(R.string.google_account_type).equals(arg)) {
+            Bundle result = new Bundle();
+            result.putParcelableArray("accounts", AccountManager.get(getContext()).getAccountsByType(arg));
+            return result;
+        } else if ("clear_password".equals(method)) {
+            Account a = extras.getParcelable("clear_password");
+            AccountManager.get(getContext()).clearPassword(a);
+            return null;
+        }
+        throw new UnsupportedOperationException(String.format("Unsupported method call %s(%s).", method, arg));
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Nullable
+    @Override
+    public String getType(Uri uri) {
+        return "text/plain";
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
index 10a20b40..7923affd 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
@@ -31,6 +31,7 @@ import com.google.android.gms.common.data.DataHolder;
 import com.google.android.gms.common.internal.ICancelToken;
 import com.google.android.gms.people.internal.IPeopleCallbacks;
 import com.google.android.gms.people.internal.IPeopleService;
+import com.google.android.gms.people.model.AccountMetadata;
 
 import org.microg.gms.common.NonCancelToken;
 
@@ -48,13 +49,15 @@ public class PeopleServiceImpl extends IPeopleService.Stub {
     public void loadOwners(final IPeopleCallbacks callbacks, boolean var2, boolean var3, final String accountName, String var5, int sortOrder) {
         Log.d(TAG, "loadOwners: " + var2 + ", " + var3 + ", " + accountName + ", " + var5 + ", " + sortOrder);
         AccountManager accountManager = AccountManager.get(context);
-        Bundle extras = new Bundle();
+        Bundle accountMetadata = new Bundle();
         String accountType = context.getString(R.string.google_account_type);
         for (Account account : accountManager.getAccountsByType(accountType)) {
             if (accountName == null || account.name.equals(accountName)) {
-                extras.putParcelable(account.name, null);
+                accountMetadata.putParcelable(account.name, new AccountMetadata());
             }
         }
+        Bundle extras = new Bundle();
+        extras.putBundle("account_metadata", accountMetadata);
         try {
             DatabaseHelper databaseHelper = new DatabaseHelper(context);
             DataHolder dataHolder = DataHolder.fromCursor(databaseHelper.getOwners(), 0, extras);