diff --git a/src/pretix/control/templates/pretixcontrol/email_setup_simple.html b/src/pretix/control/templates/pretixcontrol/email_setup_simple.html
index 05ec59d8e..c37e07b45 100644
--- a/src/pretix/control/templates/pretixcontrol/email_setup_simple.html
+++ b/src/pretix/control/templates/pretixcontrol/email_setup_simple.html
@@ -20,7 +20,7 @@
             </div>
             <div class="panel-body form-horizontal">
                 {% if spf_warning %}
-                    <div class="alert alert-warning">
+                    <div class="alert alert-danger">
                         <p>
                             {{ spf_warning }}
                         </p>
@@ -70,10 +70,18 @@
             </div>
         </div>
 
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
+        {% if spf_warning %}
+            <div class="form-group submit-group">
+                <a href="" class="btn btn-default btn-save">
+                    {% trans "Cancel" %}
+                </a>
+            </div>
+        {% else %}
+            <div class="form-group submit-group">
+                <button type="submit" class="btn btn-primary btn-save">
+                    {% trans "Save" %}
+                </button>
+            </div>
+        {% endif %}
     </form>
 {% endblock %}
diff --git a/src/pretix/control/views/mailsetup.py b/src/pretix/control/views/mailsetup.py
index 4a4cf01b2..eca96a405 100644
--- a/src/pretix/control/views/mailsetup.py
+++ b/src/pretix/control/views/mailsetup.py
@@ -192,8 +192,8 @@ class MailSettingsSetupView(TemplateView):
                 spf_record = get_spf_record(hostname)
                 if not spf_record:
                     spf_warning = _(
-                        'We could not find an SPF record set for the domain you are trying to use. You can still '
-                        'proceed, but it will increase the chance of emails going to spam or being rejected. We '
+                        'We could not find an SPF record set for the domain you are trying to use. This means that '
+                        'there is a very high change most of the emails will be rejected or markes as spam. We '
                         'strongly recommend setting an SPF record on the domain. You can do so through the DNS '
                         'settings at the provider you registered your domain with.'
                     )
@@ -205,7 +205,8 @@ class MailSettingsSetupView(TemplateView):
                         'this system in the SPF record.'
                     )
 
-            if settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED:
+            verification = settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED and not spf_warning
+            if verification:
                 if 'verification' in self.request.POST:
                     messages.error(request, _('The verification code was incorrect, please try again.'))
                 else:
@@ -230,7 +231,7 @@ class MailSettingsSetupView(TemplateView):
                 context={
                     'basetpl': self.basetpl,
                     'object': self.object,
-                    'verification': settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED,
+                    'verification': verification,
                     'spf_warning': spf_warning,
                     'spf_record': spf_record,
                     'spf_key': settings.MAIL_CUSTOM_SENDER_SPF_STRING,
diff --git a/src/tests/control/test_events.py b/src/tests/control/test_events.py
index 6072b398c..d6d98a58d 100644
--- a/src/tests/control/test_events.py
+++ b/src/tests/control/test_events.py
@@ -633,7 +633,7 @@ class EventsTest(SoupTest):
             },
             follow=True
         )
-        assert doc.select('.alert-warning')
+        assert doc.select('.alert-danger')
         self.event1.settings.flush()
         # not yet saved
         assert "mail_from" not in self.event1.settings._cache()
diff --git a/src/tests/control/test_organizer.py b/src/tests/control/test_organizer.py
index 28538c268..fe4b33656 100644
--- a/src/tests/control/test_organizer.py
+++ b/src/tests/control/test_organizer.py
@@ -221,7 +221,7 @@ class OrganizerTest(SoupTest):
             },
             follow=True
         )
-        assert doc.select('.alert-warning')
+        assert doc.select('.alert-danger')
         self.orga1.settings.flush()
         # not yet saved
         assert "mail_from" not in self.orga1.settings._cache()