diff --git a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
index 2bd22df6d..918f98dae 100644
--- a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
+++ b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
@@ -92,12 +92,8 @@ abstract class CreateOrUpdateRegistrarCommand extends MutatingCommand {
   String registrarName;
 
   @Nullable
-  @Parameter(
-      names = "--email",
-      description = "Email address of registrar",
-      converter = OptionalStringParameter.class,
-      validateWith = OptionalStringParameter.class)
-  Optional<String> email;
+  @Parameter(names = "--email", description = "Email address of registrar")
+  String email;
 
   @Nullable
   @Parameter(
@@ -280,8 +276,11 @@ abstract class CreateOrUpdateRegistrarCommand extends MutatingCommand {
       if (!isNullOrEmpty(registrarName)) {
         builder.setRegistrarName(registrarName);
       }
-      if (email != null) {
-        builder.setEmailAddress(email.orElse(null));
+      if (!isNullOrEmpty(email)) {
+        builder.setEmailAddress(email);
+      } else if (!isNullOrEmpty(
+          icannReferralEmail)) { // fall back to ICANN referral email if present
+        builder.setEmailAddress(icannReferralEmail);
       }
       if (url != null) {
         builder.setUrl(url.orElse(null));
diff --git a/javatests/google/registry/tools/CreateRegistrarCommandTest.java b/javatests/google/registry/tools/CreateRegistrarCommandTest.java
index 5cef82ebb..ef060aab9 100644
--- a/javatests/google/registry/tools/CreateRegistrarCommandTest.java
+++ b/javatests/google/registry/tools/CreateRegistrarCommandTest.java
@@ -89,6 +89,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
     assertThat(registrar.getLastUpdateTime()).isEqualTo(registrar.getCreationTime());
     assertThat(registrar.getBlockPremiumNames()).isFalse();
     assertThat(registrar.getPoNumber()).isEmpty();
+    assertThat(registrar.getIcannReferralEmail()).isEqualTo("foo@bar.test");
 
     verify(connection)
         .sendPostRequest(
@@ -563,6 +564,27 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
     assertThat(registrar.get().getEmailAddress()).isEqualTo("foo@foo.foo");
   }
 
+  @Test
+  public void testSuccess_fallBackToIcannReferralEmail() throws Exception {
+    runCommandForced(
+        "--name=blobio",
+        "--password=some_password",
+        "--registrar_type=REAL",
+        "--iana_id=8",
+        "--passcode=01234",
+        "--icann_referral_email=foo@bar.test",
+        "--street=\"123 Fake St\"",
+        "--city Fakington",
+        "--state MA",
+        "--zip 00351",
+        "--cc US",
+        "clientz");
+
+    Optional<Registrar> registrar = Registrar.loadByClientId("clientz");
+    assertThat(registrar).isPresent();
+    assertThat(registrar.get().getEmailAddress()).isEqualTo("foo@bar.test");
+  }
+
   @Test
   public void testSuccess_url() throws Exception {
     runCommandForced(
@@ -618,7 +640,6 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
         "--billing_id=null",
         "--phone=null",
         "--fax=null",
-        "--email=null",
         "--url=null",
         "--drive_folder_id=null",
         "--street=\"123 Fake St\"",
@@ -635,7 +656,6 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
     assertThat(registrar.getBillingIdentifier()).isNull();
     assertThat(registrar.getPhoneNumber()).isNull();
     assertThat(registrar.getFaxNumber()).isNull();
-    assertThat(registrar.getEmailAddress()).isNull();
     assertThat(registrar.getUrl()).isNull();
     assertThat(registrar.getDriveFolderId()).isNull();
 
@@ -651,7 +671,6 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
         "--billing_id=",
         "--phone=",
         "--fax=",
-        "--email=",
         "--url=",
         "--drive_folder_id=",
         "--icann_referral_email=foo@bar.test",
@@ -669,7 +688,6 @@ public class CreateRegistrarCommandTest extends CommandTestCase<CreateRegistrarC
     assertThat(registrar.getBillingIdentifier()).isNull();
     assertThat(registrar.getPhoneNumber()).isNull();
     assertThat(registrar.getFaxNumber()).isNull();
-    assertThat(registrar.getEmailAddress()).isNull();
     assertThat(registrar.getUrl()).isNull();
     assertThat(registrar.getDriveFolderId()).isNull();
   }
diff --git a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
index 469fa9ed0..0d2fe07a3 100644
--- a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
+++ b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
@@ -346,7 +346,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
         .setBillingIdentifier(1L)
         .setPhoneNumber("+1.2125555555")
         .setFaxNumber("+1.2125555556")
-        .setEmailAddress("registrar@example.tld")
         .setUrl("http://www.example.tld")
         .setDriveFolderId("id")
         .build());
@@ -355,7 +354,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
     assertThat(registrar.getBillingIdentifier()).isNotNull();
     assertThat(registrar.getPhoneNumber()).isNotNull();
     assertThat(registrar.getFaxNumber()).isNotNull();
-    assertThat(registrar.getEmailAddress()).isNotNull();
     assertThat(registrar.getUrl()).isNotNull();
     assertThat(registrar.getDriveFolderId()).isNotNull();
 
@@ -365,7 +363,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
         "--billing_id=null",
         "--phone=null",
         "--fax=null",
-        "--email=null",
         "--url=null",
         "--drive_folder_id=null",
         "--force",
@@ -376,7 +373,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
     assertThat(registrar.getBillingIdentifier()).isNull();
     assertThat(registrar.getPhoneNumber()).isNull();
     assertThat(registrar.getFaxNumber()).isNull();
-    assertThat(registrar.getEmailAddress()).isNull();
     assertThat(registrar.getUrl()).isNull();
     assertThat(registrar.getDriveFolderId()).isNull();
   }
@@ -390,7 +386,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
         .setBillingIdentifier(1L)
         .setPhoneNumber("+1.2125555555")
         .setFaxNumber("+1.2125555556")
-        .setEmailAddress("registrar@example.tld")
         .setUrl("http://www.example.tld")
         .setDriveFolderId("id")
         .build());
@@ -399,7 +394,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
     assertThat(registrar.getBillingIdentifier()).isNotNull();
     assertThat(registrar.getPhoneNumber()).isNotNull();
     assertThat(registrar.getFaxNumber()).isNotNull();
-    assertThat(registrar.getEmailAddress()).isNotNull();
     assertThat(registrar.getUrl()).isNotNull();
     assertThat(registrar.getDriveFolderId()).isNotNull();
 
@@ -409,7 +403,6 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
         "--billing_id=",
         "--phone=",
         "--fax=",
-        "--email=",
         "--url=",
         "--drive_folder_id=",
         "--force",
@@ -420,11 +413,25 @@ public class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarC
     assertThat(registrar.getBillingIdentifier()).isNull();
     assertThat(registrar.getPhoneNumber()).isNull();
     assertThat(registrar.getFaxNumber()).isNull();
-    assertThat(registrar.getEmailAddress()).isNull();
     assertThat(registrar.getUrl()).isNull();
     assertThat(registrar.getDriveFolderId()).isNull();
   }
 
+  @Test
+  public void testSuccess_setIcannEmail() throws Exception {
+    runCommand("--icann_referral_email=foo@bar.test", "--force", "TheRegistrar");
+    Registrar registrar = loadRegistrar("TheRegistrar");
+    assertThat(registrar.getIcannReferralEmail()).isEqualTo("foo@bar.test");
+    assertThat(registrar.getEmailAddress()).isEqualTo("foo@bar.test");
+  }
+
+  @Test
+  public void testSuccess_setEmail() throws Exception {
+    runCommand("--email=foo@bar.baz", "--force", "TheRegistrar");
+    Registrar registrar = loadRegistrar("TheRegistrar");
+    assertThat(registrar.getEmailAddress()).isEqualTo("foo@bar.baz");
+  }
+
   @Test
   public void testSuccess_setWhoisServer_works() throws Exception {
     runCommand("--whois=whois.goth.black", "--force", "NewRegistrar");