diff --git a/CHANGES.md b/CHANGES.md
index a1c3437..dbdac52 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,14 @@
 
 ## 2.0.0 (unreleased)
 
+- Fix the user/group property-mapping widgets disappearing from the Plone
+  control panel: scope the `pat-autotoc` tabbing to the top-level
+  `fieldset.formPanel` sections so it no longer hides the nested, legend-less
+  fieldsets rendered by the `yafowil.widget.dict` / `yafowil.widget.array`
+  widgets.
+  Fixes [issue #154](https://github.com/collective/pas.plugins.ldap/issues/154).
+  [jensens]
+
 - Derive the package version from git tags via `hatch-vcs` (the static
   `version` in `pyproject.toml` is gone). Releases are now made by tagging.
   [jensens]
diff --git a/src/pas/plugins/ldap/properties.yaml b/src/pas/plugins/ldap/properties.yaml
index af73cbe..5e93db5 100644
--- a/src/pas/plugins/ldap/properties.yaml
+++ b/src/pas/plugins/ldap/properties.yaml
@@ -4,7 +4,13 @@ props:
     action: expr:context.action
     class: edit-form enableFormTabbing pat-autotoc enableUnloadProtection
     data:
-        pat-autotoc: "levels: legend; section: fieldset; className: autotabs"
+        # Scope the auto-TOC tabbing to the top-level section fieldsets only
+        # (server/users/groups/cache all carry the ``formPanel`` class).
+        # A bare ``section: fieldset`` also matched the nested, legend-less
+        # ``<fieldset>`` wrappers that yafowil.widget.dict / .array render,
+        # which made pat-autotoc hide the user/group property-mapping widgets
+        # in the Plone control panel (see issue #154).
+        pat-autotoc: "levels: legend; section: fieldset.formPanel; className: autotabs"
 widgets:
 - server:
     factory: "*userpassanon:fieldset"