diff --git a/app/scripts/controllers/editRegistrationModal.js b/app/scripts/controllers/editRegistrationModal.js
index c2e54ab8b..0bf34206c 100644
--- a/app/scripts/controllers/editRegistrationModal.js
+++ b/app/scripts/controllers/editRegistrationModal.js
@@ -15,6 +15,7 @@ angular
     ) {
       $scope.conference = angular.copy(conference);
       $scope.registration = angular.copy(registration);
+      $scope.adminEditing = true; // Used in emailQuestion.html to prevent converting invalid email addresses to undefined
       $scope.adminEditRegistrant = _.find($scope.registration.registrants, {
         id: registrantId,
       });
diff --git a/app/views/blocks/emailQuestion.html b/app/views/blocks/emailQuestion.html
index 97db94d54..db8c29b75 100644
--- a/app/views/blocks/emailQuestion.html
+++ b/app/views/blocks/emailQuestion.html
@@ -5,7 +5,7 @@
   class="form-control"
   placeholder="example@example.com"
   ng-model="answer.value"
-  ng-model-options="{ debounce: 1000 }"
+  ng-model-options="{ allowInvalid: adminEditing, debounce: 1000 }"
   ng-required="block.required"
   ng-disabled="editBlock || lockedStaffProfileBlock"
 />
diff --git a/app/views/modals/editRegistration.html b/app/views/modals/editRegistration.html
index 7ff9b48f1..5d296c437 100644
--- a/app/views/modals/editRegistration.html
+++ b/app/views/modals/editRegistration.html
@@ -41,12 +41,7 @@ <h4 ng-show="saving">
       >
         Save &amp; Set as Completed
       </button>
-      <button
-        ng-click="submit()"
-        ng-disabled="!editRegistrationForm.$valid"
-        class="btn btn-primary"
-        translate
-      >
+      <button ng-click="submit()" class="btn btn-primary" translate>
         Save
       </button>
     </div>