diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html b/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html
index 99c38ddc24..9bb781945e 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_customer.html
@@ -10,14 +10,14 @@
         <div class="panel-group" id="customer">
             <fieldset class="panel panel-default accordion-panel">
                 <legend class="accordion-radio">
-                    <div class="panel-heading">
-                        <p class="panel-title">
+                    <label class="panel-heading">
+                        <span class="panel-title">
                             <input type="radio" name="customer_mode" value="login"
                                     {% if selected == "login" or not signup_allowed %}checked="checked"{% endif %}
                                     id="input_customer_login" aria-controls="customer_login" />
                             <label for="input_customer_login"><strong>{% trans "Log in with a customer account" %}</strong></label>
-                        </p>
-                    </div>
+                        </span>
+                    </label>
                 </legend>
                 <div id="customer_login" class="panel-body form-horizontal">
                     {% if customer %}
@@ -77,14 +77,14 @@
             {% if signup_allowed %}
                 <fieldset class="panel panel-default accordion-panel">
                     <legend class="accordion-radio">
-                        <div class="panel-heading">
-                            <p class="panel-title">
+                        <label class="panel-heading">
+                            <span class="panel-title">
                                 <input type="radio" name="customer_mode" value="register"
                                         {% if selected == "register" %}checked="checked"{% endif %}
                                         id="input_customer_register" aria-controls="customer_register" />
                                 <label for="input_customer_register"><strong>{% trans "Create a new customer account" %}</strong></label>
-                            </p>
-                        </div>
+                            </span>
+                        </label>
                     </legend>
                     <div id="customer_register" class="panel-body form-horizontal">
                         {% bootstrap_form register_form layout="checkout" %}
@@ -101,14 +101,14 @@
             {% if guest_allowed %}
                 <fieldset class="panel panel-default accordion-panel">
                     <legend class="accordion-radio">
-                        <div class="panel-heading">
-                            <p class="panel-title">
+                        <label class="panel-heading">
+                            <span class="panel-title">
                                 <input type="radio" name="customer_mode" value="guest"
                                         {% if selected == "guest" %}checked="checked"{% endif %}
                                         id="input_customer_guest" aria-controls="customer_guest" />
                                 <label for="input_customer_guest"><strong>{% trans "Continue as a guest" %}</strong></label>
-                            </p>
-                        </div>
+                            </span>
+                        </label>
                     </legend>
                     <div id="customer_guest" class="panel-body form-horizontal">
                         <p>
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index 9c7e20eaa1..ac7a73f360 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -64,8 +64,8 @@
                 {% for p in providers %}
                     <fieldset class="panel panel-default accordion-panel">
                         <legend class="accordion-radio">
-                            <div class="panel-heading">
-                                <p class="panel-title">
+                            <label class="panel-heading">
+                                <span class="panel-title">
                                     {% if show_fees %}
                                         <strong class="pull-right flip">{% if p.fee < 0 %}-{% else %}+{% endif %} {{ p.fee|money:event.currency|cut:"-" }}</strong>
                                     {% endif %}
@@ -76,8 +76,8 @@
                                            aria-controls="payment_{{ p.provider.identifier }}"
                                            data-wallets="{{ p.provider.walletqueries|join:"|" }}" />
                                     <label for="input_payment_{{ p.provider.identifier }}"><strong>{{ p.provider.public_name }}</strong></label>
-                                </p>
-                            </div>
+                                </span>
+                            </label>
                         </legend>
                         <div id="payment_{{ p.provider.identifier }}" class="panel-body form-horizontal">
                             {% if request.event.testmode %}