diff --git a/src/pretix/presale/templates/pretixpresale/event/timemachine.html b/src/pretix/presale/templates/pretixpresale/event/timemachine.html
index f613c6acdd..80854bc1c0 100644
--- a/src/pretix/presale/templates/pretixpresale/event/timemachine.html
+++ b/src/pretix/presale/templates/pretixpresale/event/timemachine.html
@@ -17,7 +17,7 @@
         <div class="panel-body">
             <form action="" method="post" class="">
                 {% csrf_token %}
-                {% bootstrap_form_errors timemachine_form %}
+                {% bootstrap_form_errors timemachine_form "all" %}
 
                 <p>{% trans "Test your shop as if it were a different date and time." %}</p>
 
@@ -30,14 +30,17 @@
                             {% if request.session.timemachine_now_dt %}{% trans "Change" %}{% else %}{% trans "Enable time machine" %}{% endif %}
                         </button>
                         {% if request.session.timemachine_now_dt %}
-                        <button name="timemachine_disable" value="true" type="submit" class="btn btn-default btn-lg btn-save">
+                        <button form="disable_form" type="submit" class="btn btn-default btn-lg btn-save">
                             {% trans "Disable" %}
                         </button>
                         {% endif %}
                     </div>
                 </div>
             </form>
-
+            <form action="" method="post" class="" id="disable_form">
+                {% csrf_token %}
+                <input type="hidden" name="timemachine_disable" value="true">
+            </form>
             <div class="clear"></div>
         </div>
     </div>
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index adedaeb9c1..578f348351 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -931,7 +931,7 @@ class TimemachineForm(forms.Form):
     now_dt = forms.SplitDateTimeField(
         label=_('Fake date time'),
         widget=SplitDateTimePickerWidget(),
-        initial=lambda: now().astimezone(get_current_timezone())
+        initial=lambda: now().astimezone(get_current_timezone()),
     )
 
 
@@ -965,6 +965,8 @@ class EventTimeMachine(EventViewMixin, TemplateView):
         elif self.timemachine_form.is_valid():
             request.session['timemachine_now_dt'] = str(self.timemachine_form.cleaned_data['now_dt'])
             return redirect(eventreverse(request.event, "presale:event.index"))
+        else:
+            return self.get(request)
 
     def get_success_url(self) -> str:
         return eventreverse(self.request.event, 'presale:event.timemachine')