diff --git a/WcaOnRails/app/models/competition.rb b/WcaOnRails/app/models/competition.rb
index 9d56f86035..b658285f39 100644
--- a/WcaOnRails/app/models/competition.rb
+++ b/WcaOnRails/app/models/competition.rb
@@ -189,14 +189,6 @@ def can_receive_registration_emails?(user_id)
     return false
   end
 
-  validate :must_be_an_organizer_or_delegate_to_set_receive_registration_emails
-  def must_be_an_organizer_or_delegate_to_set_receive_registration_emails
-    if editing_user_id && !@receive_registration_emails.nil?
-      if !can_receive_registration_emails?(editing_user_id)
-        errors.add(:receive_registration_emails, "You cannot receive registration emails for this competition.")
-      end
-    end
-  end
   after_save :update_receive_registration_emails
   def update_receive_registration_emails
     if editing_user_id && !@receive_registration_emails.nil?
diff --git a/WcaOnRails/spec/controllers/competitions_controller_spec.rb b/WcaOnRails/spec/controllers/competitions_controller_spec.rb
index 41b9fcab4c..f0190e2e8c 100644
--- a/WcaOnRails/spec/controllers/competitions_controller_spec.rb
+++ b/WcaOnRails/spec/controllers/competitions_controller_spec.rb
@@ -209,7 +209,7 @@
       let(:organizer) { FactoryGirl.create(:delegate) }
       before :each do
         competition.organizers << organizer
-        competition.save
+        competition.save!
         sign_in organizer
       end
 
@@ -222,7 +222,7 @@
       it "who is also the delegate can remove oneself as delegate" do
         # First, make the organizer of the competition the delegate of the competition.
         competition.delegates << organizer
-        competition.save
+        competition.save!
 
         # Remove ourself as a delegate. This should be allowed, because we're
         # still an organizer.
@@ -259,7 +259,7 @@
 
         # Remove ourself as an organizer. This should be allowed, because we're
         # still able to administer results.
-        patch :update, id: competition, competition: { delegate_ids: "", organizer_ids: "" }
+        patch :update, id: competition, competition: { delegate_ids: "", organizer_ids: "", receive_registration_emails: true }
         expect(competition.reload.delegates).to eq []
         expect(competition.reload.organizers).to eq []
       end