diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index 9a51a68e4..b2de7a14d 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -16,6 +16,7 @@
                                 <strong class="pull-right">+ {{ p.fee|floatformat:2 }} {{ event.currency }}</strong>
                                 <input type="radio" name="payment" value="{{ p.provider.identifier }}"
                                         data-parent="#payment_accordion"
+                                        required="True"
                                         data-toggle="radiocollapse" data-target="#payment_{{ p.provider.identifier }}" />
                                 <strong>{{ p.provider.verbose_name }}</strong>
                             </label>
@@ -29,7 +30,13 @@
             {% endfor %}
         </div>
         <div class="row checkout-button-row">
-            <div class="col-md-4 col-md-offset-8">
+            <div class="col-md-4">
+                <a class="btn btn-block btn-default btn-lg"
+                        href="{{ view.get_previous_url }}">
+                    {% trans "Go back" %}
+                </a>
+            </div>
+            <div class="col-md-4 col-md-offset-4">
                 <button class="btn btn-block btn-primary btn-lg" type="submit">
                     {% trans "Continue" %}
                 </button>
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index 66df839f3..61136c223 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -21,7 +21,8 @@
                             </a>
                         </h4>
                     </div>
-                    <div id="cp{{ form.cartpos.identity }}" class="panel-collapse collapse">
+                    <div id="cp{{ form.cartpos.identity }}"
+                            class="panel-collapse collapse {% if forloop.counter0 == 0 %}in{% endif %}">
                         <div class="panel-body">
                             {% bootstrap_form form layout="horizontal" %}
                         </div>
@@ -30,7 +31,13 @@
             {% endfor %}
         </div>
         <div class="row checkout-button-row">
-            <div class="col-md-4 col-md-offset-8">
+            <div class="col-md-4">
+                <a class="btn btn-block btn-default btn-lg"
+                        href="{{ view.get_previous_url }}">
+                    {% trans "Go back" %}
+                </a>
+            </div>
+            <div class="col-md-4 col-md-offset-4">
                 <button class="btn btn-block btn-primary btn-lg" type="submit">
                     {% trans "Continue" %}
                 </button>