diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index f5a55a5f66c5..cbf70697a5a2 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -249,8 +249,7 @@
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=Rights
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=usersgroups.extensionrights
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=UserProfile
-                <!--/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=userdirectory
-                  TODO https://jira.xwiki.org/browse/XWIKI-21772 -->
+                /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=userdirectory
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Registration
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Invitation
                 /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Authentication
diff --git a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java
index 71d1719e92aa..cd8dd938c709 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java
+++ b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/src/main/java/org/xwiki/validator/HTML5DutchWebGuidelinesValidator.java
@@ -1160,12 +1160,16 @@ public void validateRpd13s1()
                 if (id != null) {
                     // Looking for the label associated to the input.
                     boolean hasLabel = false;
-                    for (Element label : getElement(ELEM_BODY).getElementsByTag("label")) {
+                    String labelTagName = "label";
+                    for (Element label : getElement(ELEM_BODY).getElementsByTag(labelTagName)) {
                         if (id.equals(label.attr("for"))) {
                             hasLabel = true;
                             break;
                         }
                     }
+                    // From MDN webdocs: Alternatively, you can nest the <input> directly inside the <label>,
+                    // in which case the for and id attributes are not needed because the association is implicit
+                    hasLabel = hasLabel || input.parent().tag().getName().equals(labelTagName);
                     assertTrue(Type.ERROR, message, hasLabel);
                 }
             }