diff --git a/src/googleplay/AndroidManifest.xml b/src/googleplay/AndroidManifest.xml
index e103d8092..50cbc0345 100644
--- a/src/googleplay/AndroidManifest.xml
+++ b/src/googleplay/AndroidManifest.xml
@@ -23,7 +23,7 @@
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyBXGYNWNQcfse4JS5gI9teTSKMzinWzL2M"/>
+            android:value="@string/gapi_key"/>
 
         <activity
             android:name=".activities.DonationActivity"
diff --git a/src/googleplay/java/org/tasks/dialogs/LocationPickerDialog.java b/src/googleplay/java/org/tasks/dialogs/LocationPickerDialog.java
index aa0bac7d7..8d21c6b99 100644
--- a/src/googleplay/java/org/tasks/dialogs/LocationPickerDialog.java
+++ b/src/googleplay/java/org/tasks/dialogs/LocationPickerDialog.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.ResultCallback;
 import com.google.android.gms.location.places.Place;
@@ -140,10 +141,9 @@ public class LocationPickerDialog extends InjectingDialogFragment implements Goo
                 log.error(e.getMessage(), e);
             }
         } else {
-            Toast.makeText(fragmentActivity, String.format("%s: %s\n%s",
-                    fragmentActivity.getString(R.string.app_name),
-                    fragmentActivity.getString(R.string.common_google_play_services_notification_ticker),
-                    connectionResult.getErrorCode()), Toast.LENGTH_LONG).show();
+            GooglePlayServicesUtil
+                    .getErrorDialog(connectionResult.getErrorCode(), fragmentActivity, RC_RESOLVE_GPS_ISSUE)
+                    .show();
         }
     }
 }