diff --git a/src/pretix/control/templates/pretixcontrol/item/index.html b/src/pretix/control/templates/pretixcontrol/item/index.html
index 0ce0c034e..6594fcd9d 100644
--- a/src/pretix/control/templates/pretixcontrol/item/index.html
+++ b/src/pretix/control/templates/pretixcontrol/item/index.html
@@ -238,7 +238,7 @@
                             </div>
                         </div>
                     </fieldset>
-                    <fieldset>
+                    <fieldset id="tab-item-additional-settings">
                         <legend>{% trans "Additional settings" %}</legend>
                         {% bootstrap_field form.issue_giftcard layout="control" %}
                         {% if form.grant_membership_type %}
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html
index d2fa31854..ce39171d1 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html
@@ -157,7 +157,7 @@
                         {% bootstrap_field sform.giftcard_expiry_years layout="control" %}
                         {% bootstrap_field sform.giftcard_length layout="control" %}
                     </fieldset>
-                    <fieldset>
+                    <fieldset id="tab-organizer-privacy">
                         <legend>{% trans "Privacy" %}</legend>
                         {% bootstrap_field sform.privacy_url layout="control" %}
                         <div class="alert alert-legal">
diff --git a/src/pretix/static/pretixcontrol/js/ui/tabs.js b/src/pretix/static/pretixcontrol/js/ui/tabs.js
index d6784356b..7015d70e0 100644
--- a/src/pretix/static/pretixcontrol/js/ui/tabs.js
+++ b/src/pretix/static/pretixcontrol/js/ui/tabs.js
@@ -12,7 +12,8 @@ $(function () {
         var validity_error = false;
         $form.find("fieldset").each(function () {
             var $fieldset = $(this);
-            var tid = "tab-" + j + "-" + i;
+            var tid = $fieldset.attr("id");
+            if (!tid) tid = "tab-" + j + "-" + i;
             var $tabli = $("<li>").appendTo($tabs);
             var $tablink = $("<a>").attr("role", "tab")
                 .attr("data-toggle", "tab")