diff --git a/src/pretix/presale/templates/pretixpresale/event/login.html b/src/pretix/presale/templates/pretixpresale/event/login.html
index cca01a4393..bc2115e67b 100644
--- a/src/pretix/presale/templates/pretixpresale/event/login.html
+++ b/src/pretix/presale/templates/pretixpresale/event/login.html
@@ -36,34 +36,36 @@
                 </div>
             </div>
         </div>
-        <div class="panel panel-default">
-            <div class="panel-heading" role="tab" id="headingOne">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" href="#guestForm" data-parent="#login_accordion">
-                        {% trans "I want to order as a guest" %}
-                    </a>
-                </h4>
-            </div>
-            <div id="guestForm" class="panel-collapse collapsed {% if request.POST.form == 'guest' %}in{% endif %}">
-                <div class="panel-body">
+        {% if "guest" in request.GET %}
+            <div class="panel panel-default">
+                <div class="panel-heading" role="tab" id="headingOne">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" href="#guestForm" data-parent="#login_accordion">
+                            {% trans "I want to order as a guest" %}
+                        </a>
+                    </h4>
+                </div>
+                <div id="guestForm" class="panel-collapse collapsed {% if request.POST.form == 'guest' %}in{% endif %}">
                     <div class="panel-body">
-                        <form class="form-horizontal" method="post">
-                            {% csrf_token %}
-                            {% bootstrap_form_errors guest_form type='all' layout='inline' %}
-                            {% bootstrap_field guest_form.email layout="horizontal" %}
-                            <input type="hidden" name="form" value="guest" />
-                            <div class="form-group">
-                                <div class="submit-group col-md-offset-3 col-md-4">
-                                    <button type="submit" class="btn btn-primary btn-save">
-                                        {% trans "Continue" %}
-                                    </button>
+                        <div class="panel-body">
+                            <form class="form-horizontal" method="post">
+                                {% csrf_token %}
+                                {% bootstrap_form_errors guest_form type='all' layout='inline' %}
+                                {% bootstrap_field guest_form.email layout="horizontal" %}
+                                <input type="hidden" name="form" value="guest" />
+                                <div class="form-group">
+                                    <div class="submit-group col-md-offset-3 col-md-4">
+                                        <button type="submit" class="btn btn-primary btn-save">
+                                            {% trans "Continue" %}
+                                        </button>
+                                    </div>
                                 </div>
-                            </div>
-                        </form>
+                            </form>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
+        {% endif %}
         <div class="panel panel-default">
             <div class="panel-heading" role="tab" id="headingOne">
                 <h4 class="panel-title">
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py
index da2bd95ac9..d4c3a7e89f 100644
--- a/src/pretix/presale/views/__init__.py
+++ b/src/pretix/presale/views/__init__.py
@@ -34,7 +34,7 @@ def login_or_guest_required(view_func):
             path, reverse('presale:event.checkout.login', kwargs={
                 'organizer': request.event.organizer.slug,
                 'event': request.event.slug,
-            }), 'next'
+            }) + '?guest=1', 'next'
         )
     return _wrapped_view
 
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index 2b81729a4f..56b325b027 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -96,7 +96,7 @@ class CartAdd(EventViewMixin, CartActionMixin, View):
                 self.get_success_url(), reverse('presale:event.checkout.login', kwargs={
                     'organizer': request.event.organizer.slug,
                     'event': request.event.slug,
-                }), 'next'
+                }) + '?guest=1', 'next'
             )
 
         return self.process(items)
diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py
index dbac1510aa..ef0aaa2dc5 100644
--- a/src/pretix/presale/views/checkout.py
+++ b/src/pretix/presale/views/checkout.py
@@ -13,8 +13,7 @@ from pretix.base.services.orders import OrderError, perform_order
 from pretix.base.signals import register_payment_providers
 from pretix.presale.forms.checkout import QuestionsForm
 from pretix.presale.views import (
-    CartDisplayMixin, EventViewMixin, LoginOrGuestRequiredMixin,
-    LoginRequiredMixin, user_cart_q,
+    CartDisplayMixin, EventViewMixin, LoginOrGuestRequiredMixin, user_cart_q,
 )