diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
index 5ecb7d5bd1..68f1dbfa9f 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java
@@ -61,7 +61,9 @@ public class TextSecureIdentityKeyStore implements IdentityKeyStore {
         Log.w(TAG, "Replacing existing identity...");
         VerifiedStatus verifiedStatus;
 
-        if (identityRecord.get().getVerifiedStatus() == VerifiedStatus.VERIFIED) {
+        if (identityRecord.get().getVerifiedStatus() == VerifiedStatus.VERIFIED ||
+            identityRecord.get().getVerifiedStatus() == VerifiedStatus.UNVERIFIED)
+        {
           verifiedStatus = VerifiedStatus.UNVERIFIED;
         } else {
           verifiedStatus = VerifiedStatus.DEFAULT;