diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 50c600e..e987414 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.google.android.apps.chrometophone"
       android:installLocation="auto"
-      android:versionCode="14"
+      android:versionCode="15"
       android:versionName="2.3.2">
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10" />
     
diff --git a/android/src/com/google/android/apps/chrometophone/HistoryActivity.java b/android/src/com/google/android/apps/chrometophone/HistoryActivity.java
index aa015ef..4b91817 100644
--- a/android/src/com/google/android/apps/chrometophone/HistoryActivity.java
+++ b/android/src/com/google/android/apps/chrometophone/HistoryActivity.java
@@ -117,8 +117,8 @@ public class HistoryActivity extends Activity implements OnChildClickListener {
     @Override
     protected void onActivityResult (int requestCode, int resultCode, Intent data) {
         if (requestCode == SETUP_ACTIVITY_REQUEST_CODE) {
-            SharedPreferences prefs = Prefs.get(this);
-            if (prefs.getString("deviceRegistrationID", null) == null) {
+            String gcmRegId = GCMRegistrar.getRegistrationId(this);
+            if (gcmRegId.equals("")) {
                 finish();  // user asked to exit
             }
         }