diff --git a/app/validators/form_email_validator.rb b/app/validators/form_email_validator.rb
index 57e183f7c97..914fa991090 100644
--- a/app/validators/form_email_validator.rb
+++ b/app/validators/form_email_validator.rb
@@ -10,7 +10,7 @@ module FormEmailValidator
 
     validates :email,
               email: {
-                mx: !ENV['RAILS_OFFLINE'],
+                mx_with_fallback: !ENV['RAILS_OFFLINE'],
                 ban_disposable_email: true,
               }
   end
diff --git a/spec/controllers/users/sessions_controller_spec.rb b/spec/controllers/users/sessions_controller_spec.rb
index 81c743cb446..fbc3b8ae379 100644
--- a/spec/controllers/users/sessions_controller_spec.rb
+++ b/spec/controllers/users/sessions_controller_spec.rb
@@ -62,7 +62,7 @@
 
         json ||= JSON.parse(response.body)
 
-        expect(json['remaining']).to eq(10)
+        expect(json['remaining']).to be_within(1).of(10)
       end
     end
 
diff --git a/spec/support/shared_examples_for_email_validation.rb b/spec/support/shared_examples_for_email_validation.rb
index b798cb79da9..e2a9bdecae3 100644
--- a/spec/support/shared_examples_for_email_validation.rb
+++ b/spec/support/shared_examples_for_email_validation.rb
@@ -4,6 +4,6 @@
                       detect { |v| v.class == EmailValidator }
 
     expect(email_validator.options).
-      to eq(mx: true, ban_disposable_email: true)
+      to eq(mx_with_fallback: true, ban_disposable_email: true)
   end
 end