diff --git a/src/components/orgs/OrgDetail.svelte b/src/components/orgs/OrgDetail.svelte
index 60b0bccc..13ee620c 100644
--- a/src/components/orgs/OrgDetail.svelte
+++ b/src/components/orgs/OrgDetail.svelte
@@ -326,14 +326,14 @@
         <div class="flex items-center h-5">
           <input
             bind:checked={editable.registrationEnabled}
-            id="comments"
-            name="comments"
+            id="toggle_selfservice_feature"
+            name="toggle_selfservice_feature"
             type="checkbox"
             class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
         </div>
         <div class="ml-3 text-sm">
           <label
-            for="comments"
+            for="toggle_selfservice_feature"
             class="font-medium text-gray-700">{$_('selfservice-registration')}</label>
         </div>
       </div>
@@ -375,14 +375,14 @@
             <div class="flex items-center h-5">
               <input
                 bind:checked={editable.address_checked}
-                id="comments"
-                name="comments"
+                id="toggle_address_checkbox"
+                name="toggle_address_checkbox"
                 type="checkbox"
                 class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
             </div>
             <div class="ml-3 text-sm">
               <label
-                for="comments"
+                for="toggle_address_checkbox"
                 class="font-medium text-gray-700">{$_('address')}</label>
             </div>
           </div>