diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidator.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidator.java
index d875e117c..4d8cab062 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidator.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidator.java
@@ -32,16 +32,16 @@ class AccountChangeValidator {
 
   public void validateChange(final Account originalAccount, final Account updatedAccount) {
     if (!allowNumberChange) {
-      assert updatedAccount.getNumber().equals(originalAccount.getNumber());
+      assert updatedAccount.getNumberOptional().equals(originalAccount.getNumberOptional());
 
-      if (!updatedAccount.getNumber().equals(originalAccount.getNumber())) {
+      if (!updatedAccount.getNumberOptional().equals(originalAccount.getNumberOptional())) {
         logger.error("Account number changed via \"normal\" update; numbers must be changed via changeNumber method",
             new RuntimeException());
       }
 
-      assert updatedAccount.getPhoneNumberIdentifier().equals(originalAccount.getPhoneNumberIdentifier());
+      assert updatedAccount.getPhoneNumberIdentifierOptional().equals(originalAccount.getPhoneNumberIdentifierOptional());
 
-      if (!updatedAccount.getPhoneNumberIdentifier().equals(originalAccount.getPhoneNumberIdentifier())) {
+      if (!updatedAccount.getPhoneNumberIdentifierOptional().equals(originalAccount.getPhoneNumberIdentifierOptional())) {
         logger.error(
             "Phone number identifier changed via \"normal\" update; PNIs must be changed via changeNumber method",
             new RuntimeException());
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidatorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidatorTest.java
index 484b05ff6..b7da68f59 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidatorTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidatorTest.java
@@ -14,6 +14,7 @@ import java.util.Base64;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Stream;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -21,8 +22,11 @@ import org.junit.jupiter.params.provider.MethodSource;
 
 class AccountChangeValidatorTest {
 
-  private static final String ORIGINAL_NUMBER = "+18005551234";
-  private static final String CHANGED_NUMBER = "+18005559876";
+  private static final String ORIGINAL_NUMBER = PhoneNumberUtil.getInstance().format(
+      PhoneNumberUtil.getInstance().getExampleNumber("US"), PhoneNumberUtil.PhoneNumberFormat.E164);
+
+  private static final String CHANGED_NUMBER = PhoneNumberUtil.getInstance().format(
+      PhoneNumberUtil.getInstance().getExampleNumber("FR"), PhoneNumberUtil.PhoneNumberFormat.E164);
 
   private static final UUID ORIGINAL_PNI = UUID.randomUUID();
   private static final UUID CHANGED_PNI = UUID.randomUUID();
@@ -50,25 +54,30 @@ class AccountChangeValidatorTest {
 
   private static Stream<Arguments> validateChange() {
     final Account originalAccount = mock(Account.class);
-    when(originalAccount.getNumber()).thenReturn(ORIGINAL_NUMBER);
-    when(originalAccount.getPhoneNumberIdentifier()).thenReturn(ORIGINAL_PNI);
+    when(originalAccount.getNumberOptional()).thenReturn(Optional.of(ORIGINAL_NUMBER));
+    when(originalAccount.getPhoneNumberIdentifierOptional()).thenReturn(Optional.of(ORIGINAL_PNI));
     when(originalAccount.getUsernameHash()).thenReturn(Optional.of(ORIGINAL_USERNAME_HASH));
 
     final Account unchangedAccount = mock(Account.class);
-    when(unchangedAccount.getNumber()).thenReturn(ORIGINAL_NUMBER);
-    when(unchangedAccount.getPhoneNumberIdentifier()).thenReturn(ORIGINAL_PNI);
+    when(unchangedAccount.getNumberOptional()).thenReturn(Optional.of(ORIGINAL_NUMBER));
+    when(unchangedAccount.getPhoneNumberIdentifierOptional()).thenReturn(Optional.of(ORIGINAL_PNI));
     when(unchangedAccount.getUsernameHash()).thenReturn(Optional.of(ORIGINAL_USERNAME_HASH));
 
     final Account changedNumberAccount = mock(Account.class);
-    when(changedNumberAccount.getNumber()).thenReturn(CHANGED_NUMBER);
-    when(changedNumberAccount.getPhoneNumberIdentifier()).thenReturn(CHANGED_PNI);
+    when(changedNumberAccount.getNumberOptional()).thenReturn(Optional.of(CHANGED_NUMBER));
+    when(changedNumberAccount.getPhoneNumberIdentifierOptional()).thenReturn(Optional.of(CHANGED_PNI));
     when(changedNumberAccount.getUsernameHash()).thenReturn(Optional.of(ORIGINAL_USERNAME_HASH));
 
     final Account changedUsernameAccount = mock(Account.class);
-    when(changedUsernameAccount.getNumber()).thenReturn(ORIGINAL_NUMBER);
-    when(changedUsernameAccount.getPhoneNumberIdentifier()).thenReturn(ORIGINAL_PNI);
+    when(changedUsernameAccount.getNumberOptional()).thenReturn(Optional.of(ORIGINAL_NUMBER));
+    when(changedUsernameAccount.getPhoneNumberIdentifierOptional()).thenReturn(Optional.of(ORIGINAL_PNI));
     when(changedUsernameAccount.getUsernameHash()).thenReturn(Optional.of(CHANGED_USERNAME_HASH));
 
+    final Account numberlessAccount = mock(Account.class);
+    when(numberlessAccount.getNumberOptional()).thenReturn(Optional.empty());
+    when(numberlessAccount.getPhoneNumberIdentifierOptional()).thenReturn(Optional.empty());
+    when(numberlessAccount.getUsernameHash()).thenReturn(Optional.of(ORIGINAL_USERNAME_HASH));
+
     return Stream.of(
         Arguments.of(originalAccount, unchangedAccount, AccountChangeValidator.GENERAL_CHANGE_VALIDATOR, true),
         Arguments.of(originalAccount, unchangedAccount, AccountChangeValidator.NUMBER_CHANGE_VALIDATOR, true),
@@ -80,7 +89,15 @@ class AccountChangeValidatorTest {
 
         Arguments.of(originalAccount, changedUsernameAccount, AccountChangeValidator.GENERAL_CHANGE_VALIDATOR, false),
         Arguments.of(originalAccount, changedUsernameAccount, AccountChangeValidator.NUMBER_CHANGE_VALIDATOR, false),
-        Arguments.of(originalAccount, changedUsernameAccount, AccountChangeValidator.USERNAME_CHANGE_VALIDATOR, true)
+        Arguments.of(originalAccount, changedUsernameAccount, AccountChangeValidator.USERNAME_CHANGE_VALIDATOR, true),
+
+        Arguments.of(originalAccount, numberlessAccount, AccountChangeValidator.GENERAL_CHANGE_VALIDATOR, false),
+        Arguments.of(originalAccount, numberlessAccount, AccountChangeValidator.NUMBER_CHANGE_VALIDATOR, true),
+        Arguments.of(originalAccount, numberlessAccount, AccountChangeValidator.USERNAME_CHANGE_VALIDATOR, false),
+
+        Arguments.of(numberlessAccount, originalAccount, AccountChangeValidator.GENERAL_CHANGE_VALIDATOR, false),
+        Arguments.of(numberlessAccount, originalAccount, AccountChangeValidator.NUMBER_CHANGE_VALIDATOR, true),
+        Arguments.of(numberlessAccount, originalAccount, AccountChangeValidator.USERNAME_CHANGE_VALIDATOR, false)
     );
   }
 }