diff --git a/src/pretix/base/templates/error.html b/src/pretix/base/templates/error.html
index 2589dda652..333c8267b0 100644
--- a/src/pretix/base/templates/error.html
+++ b/src/pretix/base/templates/error.html
@@ -11,6 +11,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="utf-8">
     <link rel="icon" href="{% static "pretixbase/img/favicon.ico" %}">
+    <script type="text/javascript" src="{% static "pretixbase/js/errors.js" %}"></script>
     {% block custom_header %}{% endblock %}
     {% if css_theme %}
         <link rel="stylesheet" type="text/css" href="{{ css_theme }}" />
@@ -20,6 +21,5 @@
 <div class="container">
     {% block content %}{% endblock %}
 </div>
-<script src="{% static "pretixbase/js/errors.js" %}"></script>
 </body>
 </html>
diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index 47ff1d45b1..bf9181d22c 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -66,6 +66,7 @@
             <script type="text/javascript" src="{% static "lightbox/js/lightbox.js" %}"></script>
             <script type="text/javascript" src="{% static "are-you-sure/jquery.are-you-sure.js" %}"></script>
             <script type="text/javascript" src="{% static "pretixbase/js/addressform.js" %}"></script>
+            <script type="text/javascript" src="{% static "pretixbase/js/errors.js" %}"></script>
 		{% endcompress %}
         {{ html_head|safe }}
 
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_js.html b/src/pretix/presale/templates/pretixpresale/fragment_js.html
index 37ca39ed1f..cde66ed807 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_js.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_js.html
@@ -22,4 +22,5 @@
     <script type="text/javascript" src="{% static "pretixpresale/js/ui/iframe.js" %}"></script>
     <script type="text/javascript" src="{% static "pretixbase/js/addressform.js" %}"></script>
     <script type="text/javascript" src="{% static "pretixbase/js/deanonymize_email.js" %}"></script>
+    <script type="text/javascript" src="{% static "pretixbase/js/errors.js" %}"></script>
 {% endcompress %}
diff --git a/src/pretix/static/pretixbase/js/asynctask.js b/src/pretix/static/pretixbase/js/asynctask.js
index a2833c9949..017ae706a0 100644
--- a/src/pretix/static/pretixbase/js/asynctask.js
+++ b/src/pretix/static/pretixbase/js/asynctask.js
@@ -174,15 +174,16 @@ function async_task_error(jqXHR, textStatus, errorThrown) {
         var respdom = $(jqXHR.responseText);
         var c = respdom.filter('.container');
         if (respdom.filter('form') && (respdom.filter('.has-error') || respdom.filter('.alert-danger'))) {
-            // This is a failed form validation, let's just use it
-
             if (respdom.filter('#page-wrapper') && $('#page-wrapper').length) {
+                // This is a failed form validation, let's just use it
                 async_task_replace_page("#page-wrapper", respdom.find("#page-wrapper").html());
             } else {
                 async_task_replace_page("body", jqXHR.responseText.substring(
                     jqXHR.responseText.indexOf("<body"),
                     jqXHR.responseText.indexOf("</body")
                 ));
+                document.dispatchEvent(new Event("pretix:async-task-error"))
+
             }
 
         } else if (c.length > 0) {
diff --git a/src/pretix/static/pretixbase/js/errors.js b/src/pretix/static/pretixbase/js/errors.js
index 016d48798a..ab95619cce 100644
--- a/src/pretix/static/pretixbase/js/errors.js
+++ b/src/pretix/static/pretixbase/js/errors.js
@@ -1,5 +1,11 @@
-document.getElementById('goback').onclick =
-   function() {window.history.back()};
-
-document.getElementById('reload').onclick =
- function() {window.location.reload(true)};
+['DOMContentLoaded', 'pretix:async-task-error'].forEach(function (ev) {
+  document.addEventListener(ev, function () {
+    document.querySelectorAll('#goback, #reload').forEach(function (element) {
+      const regularLoad = ev === 'DOMContentLoaded' && element.id === 'goback';
+      element.addEventListener('click', regularLoad
+        ? () => window.history.back()
+        : () => window.location.reload()
+      );
+    });
+  });
+});