diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml
index b5d9b3b17d..0cdee84f75 100644
--- a/res/xml/preferences_app_protection.xml
+++ b/res/xml/preferences_app_protection.xml
@@ -28,11 +28,11 @@
                         android:title="@string/preferences__screen_security"
                         android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
 
-    <!--<org.thoughtcrime.securesms.components.SwitchPreferenceCompat-->
-            <!--android:defaultValue="false"-->
-            <!--android:key="pref_blocking_identity_changes"-->
-            <!--android:title="@string/preferences_app_protection__safety_numbers_approval"-->
-            <!--android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>-->
+    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_blocking_identity_changes"
+            android:title="@string/preferences_app_protection__safety_numbers_approval"
+            android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>
 
     <Preference android:key="preference_category_blocked"
                 android:title="@string/preferences_app_protection__blocked_contacts" />
diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
index 6dcc39cdf4..ea84cd2260 100644
--- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
@@ -69,7 +69,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
   public static final int CONTACTS_ACCOUNT_VERSION             = 136;
   public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 151;
   public static final int REDPHONE_SUPPORT_VERSION             = 157;
-//  public static final int FINGERPRINTS_NON_BLOCKING_VESRION    = 197;
+  public static final int FINGERPRINTS_NON_BLOCKING_VESRION    = 212;
 
   private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
     add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);
@@ -83,7 +83,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
     add(MIGRATE_SESSION_PLAINTEXT);
     add(MEDIA_DOWNLOAD_CONTROLS_VERSION);
     add(REDPHONE_SUPPORT_VERSION);
-//    add(FINGERPRINTS_NON_BLOCKING_VESRION);
+    add(FINGERPRINTS_NON_BLOCKING_VESRION);
   }};
 
   private MasterSecret masterSecret;
@@ -234,9 +234,9 @@ public class DatabaseUpgradeActivity extends BaseActivity {
                           .add(new DirectoryRefreshJob(getApplicationContext()));
       }
 
-//      if (params[0] < FINGERPRINTS_NON_BLOCKING_VESRION) {
-//        TextSecurePreferences.setBlockingIdentityUpdates(getApplicationContext(), true);
-//      }
+      if (params[0] < FINGERPRINTS_NON_BLOCKING_VESRION) {
+        TextSecurePreferences.setBlockingIdentityUpdates(getApplicationContext(), true);
+      }
 
       return null;
     }
diff --git a/src/org/thoughtcrime/securesms/jobs/IdentityUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/IdentityUpdateJob.java
index 8d05789974..3741e4ca88 100644
--- a/src/org/thoughtcrime/securesms/jobs/IdentityUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/IdentityUpdateJob.java
@@ -22,7 +22,7 @@ public class IdentityUpdateJob extends MasterSecretJob {
 
   public IdentityUpdateJob(Context context, long recipientId) {
     super(context, JobParameters.newBuilder()
-                                .withGroupId(IdentityUpdateJob.class.getName())
+                                .withGroupId("IdentityUpdateJob")
                                 .withPersistence()
                                 .create());
     this.recipientId = recipientId;
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index fb854374b5..bdfc8f20ea 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -115,8 +115,7 @@ public class TextSecurePreferences {
   }
 
   public static boolean isBlockingIdentityUpdates(Context context) {
-    return true;
-//    return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
+    return getBooleanPreference(context, BLOCKING_IDENTITY_CHANGES_PREF, false);
   }
 
   public static void setBlockingIdentityUpdates(Context context, boolean value) {