diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
index df6b9b553..c84e646ab 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
@@ -67,8 +67,9 @@ public class Accounts {
                           .mapTo(UUID.class)
                           .findOnly();
 
+        boolean isNew = uuid.equals(account.getUuid());
         account.setUuid(uuid);
-        return uuid.equals(account.getUuid());
+        return isNew;
       } catch (JsonProcessingException e) {
         throw new IllegalArgumentException(e);
       }