diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html b/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html
index d173773f9..4cad95edf 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html
@@ -55,7 +55,7 @@
                             <div class="col-md-6 col-md-offset-3">
                                 {% for provider in request.organizer.sso_providers.all %}
                                     {% if provider.is_active %}
-                                        <a href="{% eventurl request.organizer "presale:organizer.customer.login" provider=provider.pk %}?next={% if request.event_domain %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.get_full_path|urlencode }}"
+                                        <a href="{% eventurl request.organizer "presale:organizer.customer.login" provider=provider.pk %}?next={% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.get_full_path|urlencode }}"
                                            class="btn btn-primary btn-lg btn-block" data-open-in-popup-window>
                                             {{ provider.button_label }}
                                         </a>
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_login_status.html b/src/pretix/presale/templates/pretixpresale/fragment_login_status.html
index faa164d6d..1a29264a3 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_login_status.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_login_status.html
@@ -9,23 +9,23 @@
                title="{% trans "View customer account" %}" data-toggle="tooltip">
                 <span class="fa fa-user" aria-hidden="true"></span>
                 {{ request.customer.name|default:request.customer.email }}</a>
-            <a href="{% if request.event_domain %}{% abseventurl request.event "presale:organizer.customer.logout" %}{% else %}{% abseventurl request.organizer "presale:organizer.customer.logout" %}{% endif %}?next={{ request.path|urlencode }}%3F{{ request.META.QUERY_STRING|urlencode }}">
+            <a href="{% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}{% abseventurl request.event "presale:organizer.customer.logout" %}{% else %}{% abseventurl request.organizer "presale:organizer.customer.logout" %}{% endif %}?next={{ request.path|urlencode }}%3F{{ request.META.QUERY_STRING|urlencode }}">
                 <span class="fa fa-sign-out" aria-hidden="true"></span>
                 {% trans "Log out" %}
             </a>
         {% else %}
             <form
-                    {% if request.event_domain %}
+                    {% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}
                         action="{% abseventurl request.event "presale:event.customer.loginstart" %}" method="post"
                     {% else %}
                         action="{% abseventurl request.organizer "presale:organizer.customer.login" %}" method="get"
                     {% endif %}
                     class="helper-display-inline">
-                {% if request.event_domain %}
+                {% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}
                     {% csrf_token %}
                 {% endif %}
                 {% if request.resolver_match.url_name != "organizer.customer.login" %}
-                    <input type="hidden" name="next" value="{% if request.event_domain %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.path }}?{{ request.META.QUERY_STRING }}">
+                    <input type="hidden" name="next" value="{% if request.domain_mode == 'event' or request.domain_mode == 'organizer_alternative' %}{{ request.scheme }}://{{ request.get_host }}{% endif %}{{ request.path }}?{{ request.META.QUERY_STRING }}">
                 {% endif %}
                 <button class="btn btn-link" type="submit">
                     <span class="fa fa-sign-in" aria-hidden="true"></span>
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index f1f29de49..ad2426c66 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -119,7 +119,7 @@ class OrderDetailMixin(NoSearchIndexViewMixin):
         if o is False:
             login_url = eventreverse_absolute(self.request.organizer, 'presale:organizer.customer.login', kwargs={})
 
-            if hasattr(self.request, "event_domain") and self.request.event_domain:
+            if self.request.domain_mode in ('event', 'organizer_alternative'):
                 nonce = get_random_string(32)
                 self.request.session['cross_domain_customer_auth_nonce'] = nonce
                 query = {