diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index fff0720848..e773523e8f 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -7,11 +7,11 @@
     <p>{% trans "Before we continue, we need you to answer some questions." %}</p>
     <form class="form-horizontal" method="post">
         {% csrf_token %}
-        <div class="panel-group" id="questions_accordion">
+        <div class="panel-group" id="questions_group">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h4 class="panel-title">
-                        <a data-toggle="collapse" href="#contact" data-parent="#questions_accordion">
+                        <a data-toggle="collapse" href="#contact">
                             <strong>{% trans "Contact information" %}</strong>
                         </a>
                     </h4>
@@ -26,7 +26,7 @@
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <h4 class="panel-title">
-                            <a data-toggle="collapse" href="#invoice" data-parent="#questions_accordion">
+                            <a data-toggle="collapse" href="#invoice">
                                 <strong>{% trans "Invoice information" %}</strong>
                                 {% if not event.settings.invoice_address_required %}
                                     {% trans "(optional)" %}
@@ -34,7 +34,7 @@
                             </a>
                         </h4>
                     </div>
-                    <div id="invoice" class="panel-collapse collapsed in">
+                    <div id="invoice" class="panel-collapse collapsed {% if event.settings.invoice_address_required %} in {% endif %}">
                         <div class="panel-body">
                             {% bootstrap_form invoice_form layout="horizontal" %}
                         </div>
@@ -45,8 +45,7 @@
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <h4 class="panel-title">
-                            <a data-toggle="collapse" href="#cp{{ form.pos.id }}"
-                                    data-parent="#questions_accordion">
+                            <a data-toggle="collapse" href="#cp{{ form.pos.id }}">
                                 <strong>{{ form.pos.item.name }}</strong>
                                 {% if form.pos.variation %}
                                     – {{ form.pos.variation }}
diff --git a/src/pretix/presale/templates/pretixpresale/event/order_modify.html b/src/pretix/presale/templates/pretixpresale/event/order_modify.html
index 1ed1b512b0..6ebe8d9ee1 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order_modify.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order_modify.html
@@ -17,6 +17,9 @@
                         <h4 class="panel-title">
                             <a data-toggle="collapse" href="#invoice" data-parent="#questions_accordion">
                                 <strong>{% trans "Invoice information" %}</strong>
+                                {% if not event.settings.invoice_address_required %}
+                                    {% trans "(optional)" %}
+                                {% endif %}
                             </a>
                         </h4>
                     </div>