diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_membership.html b/src/pretix/presale/templates/pretixpresale/event/checkout_membership.html
index bf94bbcd5..238d7a9c6 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_membership.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_membership.html
@@ -19,9 +19,9 @@
                     <div class="panel-body questions-form">
                         {% if form.position.seat %}
                             <div class="form-group">
-                                <label class="col-md-3 control-label">
-                                    {% trans "Seat" %}
-                                </label>
+                                <div class="col-md-3 control-label">
+                                    <strong role="heading" aria-level="5">{% trans "Seat" %}</strong>
+                                </div>
                                 <div class="col-md-9 form-control-text">
                                     {% include "icons/seat.svg" with cls="svg-icon" %}
                                     {{ form.position.seat }}
@@ -30,9 +30,9 @@
                         {% endif %}
                         {% if form.position.addons.all %}
                             <div class="form-group">
-                                <label class="col-md-3 control-label">
-                                    {% trans "Selected add-ons" %}
-                                </label>
+                                <div class="col-md-3 control-label">
+                                    <strong role="heading" aria-level="5">{% trans "Selected add-ons" %}</strong>
+                                </div>
                                 <div class="col-md-9 form-control-text">
                                     <ul class="addon-list">
                                         {% for a in form.position.addons.all %}
@@ -44,13 +44,13 @@
                         {% endif %}
                         {% if form.position.subevent %}
                             <div class="form-group">
-                                <label class="col-md-3 control-label">
-                                    {% trans "Date" context "subevent" %}
-                                </label>
+                                <div class="col-md-3 control-label">
+                                    <strong role="heading" aria-level="5">{% trans "Date" context "subevent" %}</strong>
+                                </div>
                                 <div class="col-md-9 form-control-text">
-                                    <ul class="addon-list">
+                                    <p class="addon-list">
                                         {{ form.position.subevent.name }} &middot; {{ form.position.subevent.get_date_range_display_with_times_as_html }}
-                                    </ul>
+                                    </p>
                                 </div>
                             </div>
                         {% endif %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index f5320d954..1a67a01c8 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -95,9 +95,9 @@
                             {% endif %}
                             {% if pos.seat %}
                                 <div class="form-group">
-                                    <label class="col-md-3 control-label">
-                                        {% trans "Seat" %}
-                                    </label>
+                                    <div class="col-md-3 control-label">
+                                        <strong role="heading" aria-level="4">{% trans "Seat" %}</strong>
+                                    </div>
                                     <div class="col-md-9 form-control-text">
                                         {% include "icons/seat.svg" with cls="svg-icon" %}
                                         {{ pos.seat }}
@@ -106,9 +106,9 @@
                             {% endif %}
                             {% if pos.addons_without_bundled %}
                                 <div class="form-group">
-                                    <label class="col-md-3 control-label">
-                                        {% trans "Selected add-ons" %}
-                                    </label>
+                                    <div class="col-md-3 control-label">
+                                        <strong role="heading" aria-level="4">{% trans "Selected add-ons" %}</strong>
+                                    </div>
                                     <div class="col-md-9 form-control-text">
                                         <ul class="addon-list">
                                             {% regroup pos.addons_without_bundled by item_and_variation as addons_by_itemvar %}
@@ -121,13 +121,13 @@
                             {% endif %}
                             {% if pos.subevent %}
                                 <div class="form-group">
-                                    <label class="col-md-3 control-label">
-                                        {% trans "Date" context "subevent" %}
-                                    </label>
+                                    <div class="col-md-3 control-label">
+                                        <strong role="heading" aria-level="4">{% trans "Date" context "subevent" %}</strong>
+                                    </div>
                                     <div class="col-md-9 form-control-text">
-                                        <ul class="addon-list">
+                                        <p class="addon-list">
                                             {{ pos.subevent.name }} &middot; {{ pos.subevent.get_date_range_display_with_times_as_html }}
-                                        </ul>
+                                        </p>
                                     </div>
                                 </div>
                             {% endif %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_change_form.html b/src/pretix/presale/templates/pretixpresale/event/fragment_change_form.html
index a3d13988e..b08146b99 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_change_form.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_change_form.html
@@ -16,13 +16,13 @@
                 <div class="form-order-change-main">
                     {% if position.subevent %}
                         <div class="form-group">
-                            <label class="col-md-3 control-label">
-                                {% trans "Date" context "subevent" %}
-                            </label>
+                            <div class="col-md-3 control-label">
+                                <strong role="heading" aria-level="4">{% trans "Date" context "subevent" %}</strong>
+                            </div>
                             <div class="col-md-9 form-control-text">
-                                <ul class="addon-list">
+                                <p class="addon-list">
                                     {{ position.subevent.name }} &middot; {{ position.subevent.get_date_range_display_with_times_as_html }}
-                                </ul>
+                                </p>
                             </div>
                         </div>
                     {% endif %}