From f3980d16c74fd3d6aa01976f1eba13638f51c529 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Mon, 12 Jan 2026 16:03:50 -0500
Subject: [PATCH 01/23] disband, reinstate PI groups

---
 LDAP.md                                       |   2 +
 README.md                                     |   5 +
 resources/lib/UnityGroup.php                  | 132 +++++---
 resources/lib/UnityLDAP.php                   |  28 +-
 resources/lib/UnityOrg.php                    |   2 +-
 resources/lib/UnityUser.php                   |   6 +-
 .../{group_disband.php => group_disabled.php} |   4 +-
 resources/mail/group_reenabled.php            |  12 +
 test/functional/PIBecomeApproveTest.php       |  23 ++
 test/functional/PIDisableTest.php             | 132 ++++++++
 test/functional/RegisterUserTest.php          |  34 ++-
 tools/docker-dev/identity/Dockerfile          |   2 +
 tools/docker-dev/identity/bootstrap.ldif      | 286 ++++++++++++++++++
 .../identity/unity-cluster-schema.ldif        |  12 +
 webroot/admin/pi-mgmt.php                     |  21 +-
 webroot/panel/pi.php                          |  23 +-
 workers/group_user_request_owner_reminder.php |   2 +-
 17 files changed, 661 insertions(+), 65 deletions(-)
 rename resources/mail/{group_disband.php => group_disabled.php} (74%)
 create mode 100644 resources/mail/group_reenabled.php
 create mode 100644 test/functional/PIDisableTest.php
 create mode 100644 tools/docker-dev/identity/unity-cluster-schema.ldif

diff --git a/LDAP.md b/LDAP.md
index 830853254..aa8516c68 100644
--- a/LDAP.md
+++ b/LDAP.md
@@ -5,3 +5,5 @@ Terminology:
 - **native user**: a user created by this account portal
 - **non-native user**: inverse of native
   - users created for administrative purposes should not be mixed with native users in the LDAP OUs given in `config.ini` or else this account portal may get confused
+- **disabled group**: a PI group that was disabled by its owner or had its owner disabled
+  - memberuid attribute should be empty
diff --git a/README.md b/README.md
index d79c6b157..20fa35257 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,11 @@ rm "$prod" && ln -s "$old" "$prod"
   - the `home` page can be copied over to `deployment/templates_overrides/home.php`
   - the `support` page should be moved over to wherever you host your documentation
 - the `notices` SQL table should be droppped
+- a new LDAP schema needs to be added:
+  ```shell
+  scp tools/docker-dev/identity/unity-cluster-schema.ldif root@your-ldap-server:/root/unity-cluster-schema.ldif
+  ssh root@your-ldap-server ldapadd -Y EXTERNAL -H ldapi:/// -f /root/unity-cluster-schema.ldif
+  ```
 
 ### 1.5 -> 1.6
 
diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index cb0991ec0..147e78a77 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -40,7 +40,7 @@ public function __toString(): string
     public function requestGroup(?bool $send_mail_to_admins = null, bool $send_mail = true): void
     {
         $send_mail_to_admins ??= CONFIG["mail"]["send_pimesg_to_admins"];
-        if ($this->exists()) {
+        if ($this->exists() && !$this->getIsDisabled()) {
             return;
         }
         if ($this->SQL->accDeletionRequestExists($this->getOwner()->uid)) {
@@ -63,6 +63,49 @@ public function requestGroup(?bool $send_mail_to_admins = null, bool $send_mail
         }
     }
 
+    public function disable(bool $send_mail = true): void
+    {
+        $this->SQL->addLog("disable_pi_group", $this->gid);
+        $memberuids = $this->getMemberUIDs();
+        if ($send_mail) {
+            $member_attributes = $this->LDAP->getUsersAttributes($memberuids, ["mail"]);
+            $member_mails = array_map(fn($x) => $x["mail"][0], $member_attributes);
+            $this->MAILER->sendMail($member_mails, "group_disabled", [
+                "group_name" => $this->gid,
+            ]);
+        }
+        $this->setIsDisabled(true);
+        if (count($memberuids) > 0) {
+            $this->entry->setAttribute("memberuid", []);
+        }
+        // TODO optimmize
+        // UnityUser::__construct() makes one LDAP query for each user
+        // updateIsQualified() makes one LDAP query for each member
+        // if user is no longer in any PI group, disqualify them
+        // FIXME uncomment
+        // foreach ($memberuids as $uid) {
+        //     $user = new UnityUser($uid, $this->LDAP, $this->SQL, $this->MAILER, $this->WEBHOOK);
+        //     $user->updateIsQualified($send_mail);
+        // }
+    }
+
+    private function reenable(bool $send_mail = true)
+    {
+        $this->SQL->addLog("reenabled_pi_group", $this->gid);
+        if ($send_mail) {
+            $this->MAILER->sendMail($this->getOwner()->getMail(), "group_reenabled", [
+                "group_name" => $this->gid,
+            ]);
+        }
+        $this->setIsDisabled(false);
+        $owner_uid = $this->getOwner()->uid;
+        if (!$this->memberUIDExists($owner_uid)) {
+            $this->addMemberUID($owner_uid);
+        }
+        // FIXME uncomment
+        // $this->getOwner()->updateIsQualified($send_mail);
+    }
+
     /**
      * This method will create the group (this is what is executed when an admin approved the group)
      */
@@ -70,11 +113,14 @@ public function approveGroup(bool $send_mail = true): void
     {
         $uid = $this->getOwner()->uid;
         $request = $this->SQL->getRequest($uid, UnitySQL::REQUEST_BECOME_PI);
-        if ($this->exists()) {
-            return;
-        }
         \ensure($this->getOwner()->exists());
-        $this->init();
+        if (!$this->entry->exists()) {
+            $this->init();
+        } elseif ($this->getIsDisabled()) {
+            $this->reenable();
+        } else {
+            throw new Exception("cannot approve group that already exists and is not disabled");
+        }
         $this->SQL->removeRequest($this->getOwner()->uid, UnitySQL::REQUEST_BECOME_PI);
         $this->SQL->addLog("approved_group", $this->getOwner()->uid);
         if ($send_mail) {
@@ -126,42 +172,6 @@ public function cancelGroupJoinRequest(UnityUser $user, bool $send_mail = true):
         }
     }
 
-    // /**
-    //  * This method will delete the group, either by admin action or PI action
-    //  */
-    // public function removeGroup($send_mail = true)
-    // {
-    //     // remove any pending requests
-    //     // this will silently fail if the request doesn't exist (which is what we want)
-    //     $this->SQL->removeRequests($this->gid);
-
-    //     // we don't need to do anything extra if the group is already deleted
-    //     if (!$this->exists()) {
-    //         return;
-    //     }
-
-    //     // first, we must record the users in the group currently
-    //     $users = $this->getGroupMembers();
-
-    //     // now we delete the ldap entry
-    //     $this->entry->ensureExists();
-    //     $this->entry->delete();
-
-    //     // Logs the change
-    //     $this->SQL->addLog("removed_group", $this->gid);
-
-    //     // send email to every user of the now deleted PI group
-    //     if ($send_mail) {
-    //         foreach ($users as $user) {
-    //             $this->MAILER->sendMail(
-    //                 $user->getMail(),
-    //                 "group_disband",
-    //                 array("group_name" => $this->gid)
-    //             );
-    //         }
-    //     }
-    // }
-
     /**
      * This method is executed when a user is approved to join the group
      * (either by admin or the group owner)
@@ -220,7 +230,7 @@ public function removeUser(UnityUser $new_user, bool $send_mail = true): void
             return;
         }
         if ($new_user->uid == $this->getOwner()->uid) {
-            throw new Exception("Cannot delete group owner from group. Disband group instead");
+            throw new Exception("Cannot delete group owner from group. Disable group instead");
         }
         $this->removeMemberUID($new_user->uid);
         $this->SQL->addLog(
@@ -326,7 +336,7 @@ private function init(): void
         \ensure(!$this->entry->exists());
         $nextGID = $this->LDAP->getNextPIGIDNumber();
         $this->entry->create([
-            "objectclass" => UnityLDAP::POSIX_GROUP_CLASS,
+            "objectclass" => ["unityClusterPIGroup", "posixGroup", "top"],
             "gidnumber" => strval($nextGID),
             "memberuid" => [$owner->uid],
         ]);
@@ -376,4 +386,40 @@ public function getGroupMembersAttributes(array $attributes, array $default_valu
             $default_values,
         );
     }
+
+    public function getIsDisabled(): bool
+    {
+        $value = $this->entry->getAttribute("isDisabled");
+        switch (count($value)) {
+            case 0:
+                return false;
+            case 1:
+                switch ($value[0]) {
+                    case "TRUE":
+                        return true;
+                    case "FALSE":
+                        return false;
+                    default:
+                        throw new \RuntimeException(
+                            sprintf(
+                                "unexpected value for isDisabled: '%s'. expected 'TRUE' or 'FALSE'",
+                                $value[0],
+                            ),
+                        );
+                }
+            default:
+                throw new \RuntimeException(
+                    sprintf(
+                        "expected value of length 0 or 1, found value %s of length %s",
+                        jsonEncode($value),
+                        count($value),
+                    ),
+                );
+        }
+    }
+
+    public function setIsDisabled(bool $new_value): void
+    {
+        $this->entry->setAttribute("isDisabled", $new_value ? "TRUE" : "FALSE");
+    }
 }
diff --git a/resources/lib/UnityLDAP.php b/resources/lib/UnityLDAP.php
index cf1cbc8ca..f314a3b30 100644
--- a/resources/lib/UnityLDAP.php
+++ b/resources/lib/UnityLDAP.php
@@ -31,7 +31,8 @@ class UnityLDAP extends LDAPConn
         "ldapPublicKey",
     ];
 
-    public const array POSIX_GROUP_CLASS = ["posixGroup", "top"];
+    // isDisabled unset or set to "FALSE"
+    private static string $NON_DEFUNCT_FILTER = "(|(!(isDisabled=*))(isDisabled=FALSE))";
 
     private string $custom_mappings_path =
         __DIR__ . "/../../" . CONFIG["ldap"]["custom_user_mappings_dir"];
@@ -194,7 +195,7 @@ public function getAllNativeUsersAttributes(
     }
 
     /** @return UnityGroup[] */
-    public function getAllPIGroups(
+    public function getAllNonDisabledPIGroups(
         UnitySQL $UnitySQL,
         UnityMailer $UnityMailer,
         UnityWebhook $UnityWebhook,
@@ -203,6 +204,7 @@ public function getAllPIGroups(
         $pi_groups_attributes = $this->pi_groupOU->getChildrenArrayStrict(
             attributes: ["cn"],
             recursive: false,
+            filter: self::$NON_DEFUNCT_FILTER,
         );
         foreach ($pi_groups_attributes as $attributes) {
             array_push(
@@ -218,35 +220,41 @@ public function getAllPIGroups(
      * @param attributes $default_values
      * @return attributes[]
      */
-    public function getAllPIGroupsAttributes(array $attributes, array $default_values = []): array
-    {
+    public function getAllNonDisabledPIGroupsAttributes(
+        array $attributes,
+        array $default_values = [],
+    ): array {
         return $this->pi_groupOU->getChildrenArrayStrict(
             $attributes,
             false, // non-recursive
-            "objectClass=posixGroup",
+            self::$NON_DEFUNCT_FILTER,
             $default_values,
         );
     }
 
     /** @return string[] */
-    public function getPIGroupGIDsWithMemberUID(string $uid): array
+    public function getNonDisabledPIGroupGIDsWithMemberUID(string $uid): array
     {
         return array_map(
             fn($x) => $x["cn"][0],
             $this->pi_groupOU->getChildrenArrayStrict(
                 ["cn"],
                 false,
-                "(memberuid=" . ldap_escape($uid, flags: LDAP_ESCAPE_FILTER) . ")",
+                sprintf(
+                    "(&(memberuid=%s)%s)",
+                    ldap_escape($uid, flags: LDAP_ESCAPE_FILTER),
+                    self::$NON_DEFUNCT_FILTER,
+                ),
             ),
         );
     }
 
     /** @return string[] */
-    public function getAllPIGroupOwnerUIDs(): array
+    public function getAllNonDisabledPIGroupOwnerUIDs(): array
     {
         return array_map(
             fn($x) => UnityGroup::GID2OwnerUID($x["cn"][0]),
-            $this->pi_groupOU->getChildrenArrayStrict(["cn"]),
+            $this->getAllNonDisabledPIGroupsAttributes(["cn"]),
         );
     }
 
@@ -276,7 +284,7 @@ public function getUID2PIGIDs(): array
     {
         $uid2pigids = [];
         // for each PI group, append that GID to the member list for each of its member UIDs
-        $pi_groups_attributes = $this->getAllPIGroupsAttributes(
+        $pi_groups_attributes = $this->getAllNonDisabledPIGroupsAttributes(
             ["cn", "memberuid"],
             default_values: ["memberuid" => []],
         );
diff --git a/resources/lib/UnityOrg.php b/resources/lib/UnityOrg.php
index 4c6839b9e..9f0384bee 100644
--- a/resources/lib/UnityOrg.php
+++ b/resources/lib/UnityOrg.php
@@ -24,7 +24,7 @@ public function init(): void
         \ensure(!$this->entry->exists());
         $nextGID = $this->LDAP->getNextOrgGIDNumber();
         $this->entry->create([
-            "objectclass" => UnityLDAP::POSIX_GROUP_CLASS,
+            "objectclass" => ["posixGroup", "top"],
             "gidnumber" => strval($nextGID),
         ]);
     }
diff --git a/resources/lib/UnityUser.php b/resources/lib/UnityUser.php
index e9cf1b811..5bcd27bc0 100644
--- a/resources/lib/UnityUser.php
+++ b/resources/lib/UnityUser.php
@@ -60,7 +60,7 @@ public function init(
         $id = $this->LDAP->getNextUIDGIDNumber($this->uid);
         \ensure(!$ldapGroupEntry->exists());
         $ldapGroupEntry->create([
-            "objectclass" => UnityLDAP::POSIX_GROUP_CLASS,
+            "objectclass" => ["posixGroup", "top"],
             "gidnumber" => strval($id),
         ]);
         \ensure(!$this->entry->exists());
@@ -346,7 +346,7 @@ public function getHomeDir(): string
      */
     public function isPI(): bool
     {
-        return $this->getPIGroup()->exists();
+        return $this->getPIGroup()->exists() && !$this->getPIGroup()->getIsDisabled();
     }
 
     public function getPIGroup(): UnityGroup
@@ -371,7 +371,7 @@ public function getOrgGroup(): UnityOrg
      */
     public function getPIGroupGIDs(): array
     {
-        return $this->LDAP->getPIGroupGIDsWithMemberUID($this->uid);
+        return $this->LDAP->getNonDisabledPIGroupGIDsWithMemberUID($this->uid);
     }
 
     /**
diff --git a/resources/mail/group_disband.php b/resources/mail/group_disabled.php
similarity index 74%
rename from resources/mail/group_disband.php
rename to resources/mail/group_disabled.php
index da2a8fc0c..dfd1432b0 100644
--- a/resources/mail/group_disband.php
+++ b/resources/mail/group_disabled.php
@@ -1,10 +1,10 @@
 <?php
 
-$this->Subject = "PI Group Disbanded"; ?>
+$this->Subject = "PI Group Disabled"; ?>
 
 <p>Hello,</p>
 
-<p>Your PI group, <?php echo $data["group_name"]; ?>, has been disbanded on the UnityHPC Platform.
+<p>Your PI group, <?php echo $data["group_name"]; ?>, has been disabled on the UnityHPC Platform.
 Any jobs associated with this PI account have been killed.</p>
 
 <p>If you believe this to be a mistake, please reply to this email</p>
diff --git a/resources/mail/group_reenabled.php b/resources/mail/group_reenabled.php
new file mode 100644
index 000000000..12b4da169
--- /dev/null
+++ b/resources/mail/group_reenabled.php
@@ -0,0 +1,12 @@
+<?php
+
+// This template is sent to the group owner when that group is re-enabled
+$this->Subject = "PI Group Re-Enabled"; ?>
+
+<p>Hello,</p>
+
+<p>
+Your PI group, <?php echo $data["group_name"]; ?>, has been reenabled on the UnityHPC Platform.
+</p>
+
+<p>If you believe this to be a mistake, please reply to this email</p>
diff --git a/test/functional/PIBecomeApproveTest.php b/test/functional/PIBecomeApproveTest.php
index 72e9173a1..d4160a4fa 100644
--- a/test/functional/PIBecomeApproveTest.php
+++ b/test/functional/PIBecomeApproveTest.php
@@ -75,4 +75,27 @@ public function testApprovePI()
             $this->assertFalse($USER->getFlag(UserFlag::QUALIFIED));
         }
     }
+
+    public function testReenableGroup()
+    {
+        global $USER, $SSO, $LDAP, $SQL, $MAILER, $WEBHOOK;
+        $this->switchUser("ResurrectedOwnerOfDisabledPIGroup");
+        $this->assertFalse($USER->isPI());
+        $user = $USER;
+        $pi_group = $USER->getPIGroup();
+        $approve_uid = $USER->uid;
+        try {
+            $this->requestGroupCreation();
+            $this->assertRequestedPIGroup(true);
+            $this->switchUser("Admin");
+            $this->approveGroup($approve_uid);
+            $this->assertTrue($user->isPI());
+        } finally {
+            if ($pi_group->memberUIDExists($approve_uid)) {
+                $pi_group->removeMemberUID($approve_uid);
+                $pi_group->setIsDisabled(true);
+                assert(!$user->isPI());
+            }
+        }
+    }
 }
diff --git a/test/functional/PIDisableTest.php b/test/functional/PIDisableTest.php
new file mode 100644
index 000000000..19947665b
--- /dev/null
+++ b/test/functional/PIDisableTest.php
@@ -0,0 +1,132 @@
+<?php
+use UnityWebPortal\lib\UserFlag;
+
+class PIDisableTest extends UnityWebPortalTestCase
+{
+    public function testDisableGroupByAdmin()
+    {
+        global $USER, $LDAP;
+        $this->switchUser("EmptyPIGroupOwner");
+        $pi_group = $USER->getPIGroup();
+        $memberuids_before = $pi_group->getMemberUIDs();
+        $this->assertFalse($pi_group->getIsDisabled());
+        $this->assertNotEmpty($pi_group->getMemberUIDs());
+        // FIXME uncomment
+        // $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+        try {
+            $this->switchUser("Admin");
+            http_post(__DIR__ . "/../../webroot/admin/pi-mgmt.php", [
+                "form_type" => "disable",
+                "pi" => $pi_group->gid,
+            ]);
+            $this->assertTrue($pi_group->getIsDisabled());
+            $this->assertEmpty($pi_group->getMemberUIDs());
+            // FIXME uncomment
+            // $this->assertFalse($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+        } finally {
+            $entry = $LDAP->getPIGroupEntry($pi_group->gid);
+            $entry->setAttribute("memberuid", $memberuids_before);
+            $entry->setAttribute("isDisabled", "FALSE");
+            // FIXME uncomment
+            // $pi_group->getOwner()->setFlag(UserFlag::QUALIFIED, true);
+        }
+    }
+
+    public function testDisableGroupByOwner()
+    {
+        global $USER, $LDAP;
+        $this->switchUser("EmptyPIGroupOwner");
+        $pi_group = $USER->getPIGroup();
+        $memberuids_before = $pi_group->getMemberUIDs();
+        $this->assertFalse($pi_group->getIsDisabled());
+        $this->assertNotEmpty($pi_group->getMemberUIDs());
+        // FIXME uncomment
+        // $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+        try {
+            http_post(__DIR__ . "/../../webroot/panel/pi.php", ["form_type" => "disable"]);
+            $this->assertTrue($pi_group->getIsDisabled());
+            $this->assertEmpty($pi_group->getMemberUIDs());
+            // FIXME uncomment
+            // $this->assertFalse($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+        } finally {
+            $entry = $LDAP->getPIGroupEntry($pi_group->gid);
+            $entry->setAttribute("memberuid", $memberuids_before);
+            $entry->setAttribute("isDisabled", "FALSE");
+            $pi_group->getOwner()->setFlag(UserFlag::QUALIFIED, true);
+        }
+    }
+
+    public function testMemberBecomesUnqualified()
+    {
+        global $USER, $LDAP;
+        $this->switchUser("Blank");
+        $new_user = $USER;
+        // FIXME uncomment
+        // $this->assertFalse($new_user->getFlag(UserFlag::QUALIFIED));
+        $this->switchUser("EmptyPIGroupOwner");
+        $pi_group = $USER->getPIGroup();
+        $memberuids_before = $pi_group->getMemberUIDs();
+        try {
+            $pi_group->newUserRequest($new_user);
+            $pi_group->approveUser($new_user);
+            // FIXME uncomment
+            // $this->assertTrue($new_user->getFlag(UserFlag::QUALIFIED));
+            http_post(__DIR__ . "/../../webroot/panel/pi.php", ["form_type" => "disable"]);
+            // FIXME uncomment
+            // $this->assertFalse($new_user->getFlag(UserFlag::QUALIFIED));
+        } finally {
+            $entry = $LDAP->getPIGroupEntry($pi_group->gid);
+            $entry->setAttribute("memberuid", $memberuids_before);
+            $entry->setAttribute("isDisabled", "FALSE");
+            $pi_group->getOwner()->setFlag(UserFlag::QUALIFIED, true);
+            // FIXME uncomment
+            // $new_user->setFlag(UserFlag::QUALIFIED, false);
+        }
+    }
+
+    public function testGetDisabledSetDisabled()
+    {
+        global $USER, $LDAP;
+        $this->switchUser("NormalPI");
+        $pi_group = $USER->getPIGroup();
+        $entry = $LDAP->getPIGroupEntry($pi_group->gid);
+        $this->assertEquals([], $entry->getAttribute("isDisabled"));
+        try {
+            $pi_group->setIsDisabled(false);
+            $this->assertFalse($pi_group->getIsDisabled());
+            $pi_group->setIsDisabled(true);
+            $this->assertTrue($pi_group->getIsDisabled());
+            $entry->removeAttribute("isDisabled");
+            $this->assertFalse($pi_group->getIsDisabled());
+        } finally {
+            if ($entry->hasAttribute("isDisabled")) {
+                $entry->removeAttribute("isDisabled");
+            }
+        }
+    }
+
+    public function testPIMgmtShowsBothGroupsWithDisabledAttributeSetFalseAndUnset()
+    {
+        global $USER, $LDAP;
+        $this->switchUser("NormalPI");
+        $pi_group = $USER->getPIGroup();
+        $entry = $LDAP->getPIGroupEntry($pi_group->gid);
+        $this->assertEquals([], $entry->getAttribute("isDisabled"));
+        $this->assertStringContainsString(
+            $pi_group->gid,
+            http_get(__DIR__ . "/../../webroot/admin/pi-mgmt.php"),
+        );
+        try {
+            $pi_group->setIsDisabled(false);
+            $this->assertEquals(["FALSE"], $entry->getAttribute("isDisabled"));
+            $this->assertStringContainsString(
+                $pi_group->gid,
+                http_get(__DIR__ . "/../../webroot/admin/pi-mgmt.php"),
+            );
+        } finally {
+            if ($entry->hasAttribute("isDisabled")) {
+                $entry->removeAttribute("isDisabled");
+            }
+        }
+    }
+}
diff --git a/test/functional/RegisterUserTest.php b/test/functional/RegisterUserTest.php
index 4c5340f5f..10bb663fd 100644
--- a/test/functional/RegisterUserTest.php
+++ b/test/functional/RegisterUserTest.php
@@ -1,7 +1,8 @@
 <?php
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use UnityWebPortal\lib\UnityOrg;
+use UnityWebPortal\lib\UnityHTTPDMessageLevel;
+use UnityWebPortal\lib\UserFlag;
 
 class RegisterUserTest extends UnityWebPortalTestCase
 {
@@ -46,4 +47,35 @@ public function testRegisterUserAndCreateOrg($nickname, $expected_uid_gid)
             ensureUserDoesNotExist($uid);
         }
     }
+
+    // FIXME uncomment
+    // public function testResurrectNoDisabledGroup()
+    // {
+    //     global $USER;
+    //     $this->switchUser("GhostNotPI");
+    //     $this->assertTrue($USER->getFlag(UserFlag::GHOST));
+    //     try {
+    //         $this->register();
+    //         $this->assertMessageExists(UnityHTTPDMessageLevel::INFO, "/.*/", "/resurrected/");
+    //         $this->assertFalse($USER->getFlag(UserFlag::GHOST));
+    //     } finally {
+    //         $USER->setFlag(UserFlag::GHOST, true);
+    //     }
+    // }
+
+    // public function testResurrectWithDisabledGroup()
+    // {
+    //     global $USER;
+    //     $this->switchUser("GhostOwnerOfDisabledPIGroup");
+    //     $this->assertTrue($USER->getFlag(UserFlag::GHOST));
+    //     $this->assertFalse($USER->isPI());
+    //     try {
+    //         $this->register();
+    //         $this->assertMessageExists(UnityHTTPDMessageLevel::INFO, "/.*/", "/resurrected/");
+    //         $this->assertFalse($USER->getFlag(UserFlag::GHOST));
+    //         $this->assertFalse($USER->isPI());
+    //     } finally {
+    //         $USER->setFlag(UserFlag::GHOST, true);
+    //     }
+    // }
 }
diff --git a/tools/docker-dev/identity/Dockerfile b/tools/docker-dev/identity/Dockerfile
index 56dc951ae..490646f3b 100644
--- a/tools/docker-dev/identity/Dockerfile
+++ b/tools/docker-dev/identity/Dockerfile
@@ -12,6 +12,7 @@ RUN rm -rf /var/lib/ldap
 RUN mkdir /var/lib/ldap
 RUN chown openldap:openldap /var/lib/ldap
 COPY ssh.ldif /etc/ldap/schema/ssh.ldif
+COPY unity-cluster-schema.ldif /etc/ldap/schema/unity-cluster.ldif
 COPY ldap-config.ldif /tmp/ldap-config.ldif
 COPY bootstrap.ldif /tmp/bootstrap.ldif
 COPY load-modules.ldif /tmp/load-modules.ldif
@@ -22,6 +23,7 @@ RUN service slapd start; \
     ldapadd    -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/nis.ldif; \
     ldapadd    -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/inetorgperson.ldif; \
     ldapadd    -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ssh.ldif; \
+    ldapadd    -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/unity-cluster.ldif; \
     ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/ldap-config.ldif; \
     ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/load-modules.ldif; \
     ldapadd    -Y EXTERNAL -H ldapi:/// -f /tmp/configure-unique.ldif; \
diff --git a/tools/docker-dev/identity/bootstrap.ldif b/tools/docker-dev/identity/bootstrap.ldif
index 86aeaf818..5e172b1e5 100644
--- a/tools/docker-dev/identity/bootstrap.ldif
+++ b/tools/docker-dev/identity/bootstrap.ldif
@@ -10432,6 +10432,7 @@ cn: pi_user36_org2_test
 gidnumber: 10206
 memberuid: user36_org2_test
 memberuid: user912_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10504,6 +10505,7 @@ memberuid: user1095_org1_test
 memberuid: user414_org1_test
 memberuid: user1020_org1_test
 memberuid: user1177_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10511,6 +10513,7 @@ dn: cn=pi_user45_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user45_org1_test
 gidnumber: 10243
 memberuid: user45_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10519,6 +10522,7 @@ cn: pi_user51_org3_test
 gidnumber: 10222
 memberuid: user51_org3_test
 memberuid: user934_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10537,6 +10541,7 @@ memberuid: user477_org1_test
 memberuid: user1265_org1_test
 memberuid: user1021_org1_test
 memberuid: user348_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10545,6 +10550,7 @@ cn: pi_user57_org2_test
 gidnumber: 10132
 memberuid: user57_org2_test
 memberuid: user67_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10552,6 +10558,7 @@ dn: cn=pi_user66_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user66_org2_test
 gidnumber: 10199
 memberuid: user66_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10566,6 +10573,7 @@ memberuid: user1073_org1_test
 memberuid: user1257_org1_test
 memberuid: user85_org1_test
 memberuid: user41_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10574,6 +10582,7 @@ cn: pi_user72_org3_test
 gidnumber: 10223
 memberuid: user72_org3_test
 memberuid: user1223_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10582,6 +10591,7 @@ cn: pi_user78_org1_test
 gidnumber: 10157
 memberuid: user78_org1_test
 memberuid: user526_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10589,6 +10599,7 @@ dn: cn=pi_user93_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user93_org1_test
 gidnumber: 10101
 memberuid: user93_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10604,6 +10615,7 @@ memberuid: user747_org1_test
 memberuid: user516_org1_test
 memberuid: user821_org1_test
 memberuid: user1196_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10612,6 +10624,7 @@ cn: pi_user113_org1_test
 gidnumber: 10099
 memberuid: user113_org1_test
 memberuid: user272_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10624,6 +10637,7 @@ memberuid: user791_org2_test
 memberuid: user987_org2_test
 memberuid: user904_org2_test
 memberuid: user839_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10636,6 +10650,7 @@ memberuid: user60_org1_test
 memberuid: user29_org1_test
 memberuid: user46_org1_test
 memberuid: user734_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10645,6 +10660,7 @@ gidnumber: 10063
 memberuid: user135_org1_test
 memberuid: user860_org1_test
 memberuid: user574_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10656,6 +10672,7 @@ memberuid: user512_org3_test
 memberuid: user406_org3_test
 memberuid: user1054_org3_test
 memberuid: user850_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10664,6 +10681,7 @@ cn: pi_user149_org1_test
 gidnumber: 10071
 memberuid: user149_org1_test
 memberuid: user263_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10673,6 +10691,7 @@ gidnumber: 10254
 memberuid: user150_org1_test
 memberuid: user1250_org1_test
 memberuid: user208_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10680,6 +10699,7 @@ dn: cn=pi_user162_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user162_org1_test
 gidnumber: 10228
 memberuid: user162_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10689,6 +10709,7 @@ gidnumber: 10179
 memberuid: user163_org1_test
 memberuid: user300_org1_test
 memberuid: user749_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10696,6 +10717,7 @@ dn: cn=pi_user166_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user166_org2_test
 gidnumber: 10165
 memberuid: user166_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10705,6 +10727,7 @@ gidnumber: 10009
 memberuid: user167_org1_test
 memberuid: user1097_org1_test
 memberuid: user690_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10712,6 +10735,7 @@ dn: cn=pi_user176_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user176_org2_test
 gidnumber: 10216
 memberuid: user176_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10720,6 +10744,7 @@ cn: pi_user181_org1_test
 gidnumber: 10245
 memberuid: user181_org1_test
 memberuid: user909_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10729,6 +10754,7 @@ gidnumber: 10150
 memberuid: user182_org1_test
 memberuid: user752_org1_test
 memberuid: user529_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10740,6 +10766,7 @@ memberuid: user99_org1_test
 memberuid: user1141_org1_test
 memberuid: user236_org1_test
 memberuid: user757_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10747,6 +10774,7 @@ dn: cn=pi_user188_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user188_org1_test
 gidnumber: 10143
 memberuid: user188_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10756,6 +10784,7 @@ gidnumber: 10260
 memberuid: user190_org000000007_test
 memberuid: user211_org000000007_test
 memberuid: user1164_org000000007_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10764,6 +10793,7 @@ cn: pi_user191_org2_test
 gidnumber: 10181
 memberuid: user191_org2_test
 memberuid: user1113_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10782,6 +10812,7 @@ memberuid: user1032_org13_test
 memberuid: user851_org1_test
 memberuid: user576_org1_test
 memberuid: user508_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10789,6 +10820,7 @@ dn: cn=pi_user5_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user5_org2_test
 gidnumber: 10135
 memberuid: user5_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10798,6 +10830,7 @@ gidnumber: 10230
 memberuid: user197_org3_test
 memberuid: user639_org3_test
 memberuid: user748_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10810,6 +10843,7 @@ memberuid: user269_org1_test
 memberuid: user1007_org1_test
 memberuid: user1258_org1_test
 memberuid: user317_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10818,6 +10852,7 @@ cn: pi_user200_org2_test
 gidnumber: 10275
 memberuid: user200_org2_test
 memberuid: user662_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10825,6 +10860,7 @@ dn: cn=pi_user201_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user201_org1_test
 gidnumber: 10010
 memberuid: user201_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10832,6 +10868,7 @@ dn: cn=pi_user205_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user205_org1_test
 gidnumber: 10274
 memberuid: user205_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10844,6 +10881,7 @@ memberuid: user588_org1_test
 memberuid: user384_org1_test
 memberuid: user1081_org1_test
 memberuid: user772_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10851,6 +10889,7 @@ dn: cn=pi_user207_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user207_org1_test
 gidnumber: 10220
 memberuid: user207_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10865,6 +10904,7 @@ memberuid: user566_org1_test
 memberuid: user511_org1_test
 memberuid: user950_org1_test
 memberuid: user894_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10872,6 +10912,7 @@ dn: cn=pi_user214_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user214_org1_test
 gidnumber: 10145
 memberuid: user214_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10887,6 +10928,7 @@ memberuid: user1016_org1_test
 memberuid: user776_org1_test
 memberuid: user1285_org1_test
 memberuid: user472_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10898,6 +10940,7 @@ memberuid: user645_org1_test
 memberuid: user745_org1_test
 memberuid: user230_org1_test
 memberuid: user364_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10905,25 +10948,31 @@ dn: cn=pi_user226_org3_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user226_org3_test
 gidnumber: 10164
 memberuid: user226_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
 dn: cn=pi_user9_org3_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user9_org3_test
 gidnumber: 10094
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
+isDisabled: TRUE
 
 dn: cn=pi_user10_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user10_org1_test
 gidnumber: 2257
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
+isDisabled: TRUE
 
 dn: cn=pi_user242_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user242_org1_test
 gidnumber: 10052
 memberuid: user242_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10932,6 +10981,7 @@ cn: pi_user247_org1_test
 gidnumber: 10126
 memberuid: user247_org1_test
 memberuid: user178_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10943,6 +10993,7 @@ memberuid: user482_org1_test
 memberuid: user254_org1_test
 memberuid: user1239_org1_test
 memberuid: user918_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10950,6 +11001,7 @@ dn: cn=pi_user253_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user253_org1_test
 gidnumber: 10013
 memberuid: user253_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10974,6 +11026,7 @@ memberuid: user767_org1_test
 memberuid: user56_org1_test
 memberuid: user1200_org1_test
 memberuid: user280_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10981,6 +11034,7 @@ dn: cn=pi_user264_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user264_org1_test
 gidnumber: 10073
 memberuid: user264_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10989,6 +11043,7 @@ cn: pi_user266_org1_test
 gidnumber: 10162
 memberuid: user266_org1_test
 memberuid: user111_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -10996,6 +11051,7 @@ dn: cn=pi_user268_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user268_org1_test
 gidnumber: 10239
 memberuid: user268_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11003,6 +11059,7 @@ dn: cn=pi_user274_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user274_org2_test
 gidnumber: 10283
 memberuid: user274_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11014,6 +11071,7 @@ memberuid: user978_org1_test
 memberuid: user155_org1_test
 memberuid: user629_org1_test
 memberuid: user217_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11022,6 +11080,7 @@ cn: pi_user278_org3_test
 gidnumber: 10180
 memberuid: user278_org3_test
 memberuid: user20_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11029,6 +11088,7 @@ dn: cn=pi_user288_org000000007_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user288_org000000007_test
 gidnumber: 10234
 memberuid: user288_org000000007_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11039,6 +11099,7 @@ memberuid: user291_org1_test
 memberuid: user473_org1_test
 memberuid: user110_org1_test
 memberuid: user441_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11046,6 +11107,7 @@ dn: cn=pi_user292_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user292_org2_test
 gidnumber: 10229
 memberuid: user292_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11053,6 +11115,7 @@ dn: cn=pi_user295_org3_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user295_org3_test
 gidnumber: 10277
 memberuid: user295_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11062,6 +11125,7 @@ gidnumber: 10209
 memberuid: user303_org1_test
 memberuid: user365_org1_test
 memberuid: user389_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11069,6 +11133,7 @@ dn: cn=pi_user304_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user304_org1_test
 gidnumber: 10248
 memberuid: user304_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11080,6 +11145,7 @@ memberuid: user58_org1_test
 memberuid: user824_org1_test
 memberuid: user21_org1_test
 memberuid: user447_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11090,6 +11156,7 @@ memberuid: user312_org1_test
 memberuid: user794_org1_test
 memberuid: user1031_org1_test
 memberuid: user556_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11099,6 +11166,7 @@ gidnumber: 10112
 memberuid: user315_org2_test
 memberuid: user392_org2_test
 memberuid: user866_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11107,6 +11175,7 @@ cn: pi_user326_org3_test
 gidnumber: 10173
 memberuid: user326_org3_test
 memberuid: user883_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11116,6 +11185,7 @@ gidnumber: 10136
 memberuid: user329_org1_test
 memberuid: user46_org1_test
 memberuid: user148_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11123,6 +11193,7 @@ dn: cn=pi_user331_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user331_org1_test
 gidnumber: 10227
 memberuid: user331_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11131,6 +11202,7 @@ cn: pi_user336_org1_test
 gidnumber: 10137
 memberuid: user336_org1_test
 memberuid: user478_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11139,6 +11211,7 @@ cn: pi_user338_org1_test
 gidnumber: 10267
 memberuid: user338_org1_test
 memberuid: user1149_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11153,6 +11226,7 @@ memberuid: user570_org1_test
 memberuid: user888_org1_test
 memberuid: user343_org1_test
 memberuid: user535_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11161,6 +11235,7 @@ cn: pi_user345_org1_test
 gidnumber: 10186
 memberuid: user345_org1_test
 memberuid: user1084_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11168,6 +11243,7 @@ dn: cn=pi_user346_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user346_org2_test
 gidnumber: 10246
 memberuid: user346_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11176,6 +11252,7 @@ cn: pi_user347_org2_test
 gidnumber: 10081
 memberuid: user347_org2_test
 memberuid: user24_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11183,6 +11260,7 @@ dn: cn=pi_user354_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user354_org1_test
 gidnumber: 10016
 memberuid: user354_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11197,6 +11275,7 @@ memberuid: user908_org1_test
 memberuid: user434_org1_test
 memberuid: user1180_org1_test
 memberuid: user1024_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11204,6 +11283,7 @@ dn: cn=pi_user372_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user372_org1_test
 gidnumber: 10053
 memberuid: user372_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11217,6 +11297,7 @@ memberuid: user301_org1_test
 memberuid: user401_org1_test
 memberuid: user306_org1_test
 memberuid: user1286_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11225,6 +11306,7 @@ cn: pi_user382_org1_test
 gidnumber: 10219
 memberuid: user382_org1_test
 memberuid: user590_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11232,6 +11314,7 @@ dn: cn=pi_user386_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user386_org1_test
 gidnumber: 10197
 memberuid: user386_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11241,6 +11324,7 @@ gidnumber: 10098
 memberuid: user391_org1_test
 memberuid: user63_org1_test
 memberuid: user874_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11248,6 +11332,7 @@ dn: cn=pi_user393_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user393_org1_test
 gidnumber: 10017
 memberuid: user393_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11256,6 +11341,7 @@ cn: pi_user395_org1_test
 gidnumber: 10122
 memberuid: user395_org1_test
 memberuid: user993_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11264,6 +11350,7 @@ cn: pi_user398_org1_test
 gidnumber: 10169
 memberuid: user398_org1_test
 memberuid: user394_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11274,6 +11361,7 @@ memberuid: user400_org1_test
 memberuid: user712_org1_test
 memberuid: user91_org1_test
 memberuid: user653_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11282,6 +11370,7 @@ cn: pi_user404_org3_test
 gidnumber: 10152
 memberuid: user404_org3_test
 memberuid: user145_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11289,6 +11378,7 @@ dn: cn=pi_user407_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user407_org1_test
 gidnumber: 10238
 memberuid: user407_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11299,6 +11389,7 @@ memberuid: user415_org3_test
 memberuid: user261_org3_test
 memberuid: user14_org3_test
 memberuid: user333_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11307,6 +11398,7 @@ cn: pi_user416_org1_test
 gidnumber: 10279
 memberuid: user416_org1_test
 memberuid: user952_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11315,6 +11407,7 @@ cn: pi_user420_org1_test
 gidnumber: 10147
 memberuid: user420_org1_test
 memberuid: user977_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11323,6 +11416,7 @@ cn: pi_user423_org1_test
 gidnumber: 10252
 memberuid: user423_org1_test
 memberuid: user1211_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11330,6 +11424,7 @@ dn: cn=pi_user424_org3_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user424_org3_test
 gidnumber: 10011
 memberuid: user424_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11345,6 +11440,7 @@ memberuid: user972_org10_test
 memberuid: user251_org2_test
 memberuid: user170_org2_test
 memberuid: user1002_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11355,6 +11451,7 @@ memberuid: user426_org3_test
 memberuid: user112_org3_test
 memberuid: user944_org3_test
 memberuid: user202_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11363,6 +11460,7 @@ cn: pi_user432_org2_test
 gidnumber: 10212
 memberuid: user432_org2_test
 memberuid: user595_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11371,6 +11469,7 @@ cn: pi_user433_org1_test
 gidnumber: 10156
 memberuid: user433_org1_test
 memberuid: user209_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11378,6 +11477,7 @@ dn: cn=pi_user436_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user436_org2_test
 gidnumber: 10236
 memberuid: user436_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11393,6 +11493,7 @@ memberuid: user422_org1_test
 memberuid: user168_org1_test
 memberuid: user759_org1_test
 memberuid: user661_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11403,6 +11504,7 @@ memberuid: user439_org2_test
 memberuid: user412_org2_test
 memberuid: user780_org2_test
 memberuid: user1133_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11413,6 +11515,7 @@ memberuid: user440_org1_test
 memberuid: user89_org1_test
 memberuid: user1080_org1_test
 memberuid: user146_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11422,6 +11525,7 @@ gidnumber: 10263
 memberuid: user442_org1_test
 memberuid: user700_org1_test
 memberuid: user1053_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11443,6 +11547,7 @@ memberuid: user1155_org1_test
 memberuid: user1008_org1_test
 memberuid: user468_org1_test
 memberuid: user240_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11452,6 +11557,7 @@ gidnumber: 10003
 memberuid: user452_org1_test
 memberuid: user316_org1_test
 memberuid: user746_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11461,6 +11567,7 @@ gidnumber: 10118
 memberuid: user453_org1_test
 memberuid: user1210_org1_test
 memberuid: user555_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11476,6 +11583,7 @@ memberuid: user874_org1_test
 memberuid: user963_org1_test
 memberuid: user397_org1_test
 memberuid: user910_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11484,6 +11592,7 @@ cn: pi_user460_org1_test
 gidnumber: 10172
 memberuid: user460_org1_test
 memberuid: user172_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11491,6 +11600,7 @@ dn: cn=pi_user466_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user466_org2_test
 gidnumber: 10166
 memberuid: user466_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11500,6 +11610,7 @@ gidnumber: 10129
 memberuid: user467_org2_test
 memberuid: user723_org2_test
 memberuid: user259_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11508,6 +11619,7 @@ cn: pi_user480_org1_test
 gidnumber: 10168
 memberuid: user480_org1_test
 memberuid: user900_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11546,6 +11658,7 @@ memberuid: user899_org1_test
 memberuid: user924_org1_test
 memberuid: user1295_org1_test
 memberuid: user1061_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11562,6 +11675,7 @@ memberuid: user553_org2_test
 memberuid: user129_org2_test
 memberuid: user669_org2_test
 memberuid: user648_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11593,6 +11707,7 @@ memberuid: user982_org1_test
 memberuid: user75_org1_test
 memberuid: user151_org1_test
 memberuid: user557_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11616,6 +11731,7 @@ memberuid: user895_org1_test
 memberuid: user623_org1_test
 memberuid: user97_org1_test
 memberuid: user953_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11626,6 +11742,7 @@ memberuid: user502_org1_test
 memberuid: user1072_org1_test
 memberuid: user1194_org1_test
 memberuid: user82_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11639,6 +11756,7 @@ memberuid: user716_org2_test
 memberuid: user584_org2_test
 memberuid: user788_org2_test
 memberuid: user170_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11646,6 +11764,7 @@ dn: cn=pi_user513_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user513_org1_test
 gidnumber: 10108
 memberuid: user513_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11655,6 +11774,7 @@ gidnumber: 10251
 memberuid: user517_org1_test
 memberuid: user1253_org1_test
 memberuid: user616_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11662,6 +11782,7 @@ dn: cn=pi_user519_org000000007_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user519_org000000007_test
 gidnumber: 10259
 memberuid: user519_org000000007_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11670,6 +11791,7 @@ cn: pi_user528_org1_test
 gidnumber: 10104
 memberuid: user528_org1_test
 memberuid: user799_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11681,6 +11803,7 @@ memberuid: user1222_org1_test
 memberuid: user16_org1_test
 memberuid: user1131_org1_test
 memberuid: user402_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11688,6 +11811,7 @@ dn: cn=pi_user532_org000000007_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user532_org000000007_test
 gidnumber: 10174
 memberuid: user532_org000000007_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11700,6 +11824,7 @@ memberuid: user353_org1_test
 memberuid: user869_org1_test
 memberuid: user1116_org1_test
 memberuid: user896_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11761,6 +11886,7 @@ memberuid: user1218_org1_test
 memberuid: user1202_org1_test
 memberuid: user1217_org1_test
 memberuid: user960_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11780,6 +11906,7 @@ memberuid: user491_org4_test
 memberuid: user689_org1_test
 memberuid: user12_org1_test
 memberuid: user697_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11788,6 +11915,7 @@ cn: pi_user546_org1_test
 gidnumber: 10193
 memberuid: user546_org1_test
 memberuid: user103_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11796,6 +11924,7 @@ cn: pi_user550_org1_test
 gidnumber: 10187
 memberuid: user550_org1_test
 memberuid: user1107_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11809,6 +11938,7 @@ memberuid: user385_org1_test
 memberuid: user1219_org1_test
 memberuid: user992_org1_test
 memberuid: user1023_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11816,6 +11946,7 @@ dn: cn=pi_user554_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user554_org2_test
 gidnumber: 10241
 memberuid: user554_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11824,6 +11955,7 @@ cn: pi_user559_org1_test
 gidnumber: 10004
 memberuid: user559_org1_test
 memberuid: user509_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11833,6 +11965,7 @@ gidnumber: 10057
 memberuid: user560_org1_test
 memberuid: user875_org1_test
 memberuid: user589_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11842,6 +11975,7 @@ gidnumber: 10054
 memberuid: user561_org1_test
 memberuid: user932_org1_test
 memberuid: user25_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11849,6 +11983,7 @@ dn: cn=pi_user564_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user564_org1_test
 gidnumber: 10123
 memberuid: user564_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11882,6 +12017,7 @@ memberuid: user544_org1_test
 memberuid: user61_org1_test
 memberuid: user846_org1_test
 memberuid: user1167_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11898,6 +12034,7 @@ memberuid: user611_org1_test
 memberuid: user1132_org1_test
 memberuid: user378_org1_test
 memberuid: user143_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11906,6 +12043,7 @@ cn: pi_user575_org1_test
 gidnumber: 10092
 memberuid: user575_org1_test
 memberuid: user863_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11913,6 +12051,7 @@ dn: cn=pi_user580_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user580_org1_test
 gidnumber: 10119
 memberuid: user580_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11920,6 +12059,7 @@ dn: cn=pi_user582_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user582_org1_test
 gidnumber: 10051
 memberuid: user582_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11927,6 +12067,7 @@ dn: cn=pi_user586_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user586_org1_test
 gidnumber: 10020
 memberuid: user586_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11938,6 +12079,7 @@ memberuid: user1104_org1_test
 memberuid: user357_org1_test
 memberuid: user39_org1_test
 memberuid: user281_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11946,6 +12088,7 @@ cn: pi_user592_org2_test
 gidnumber: 10235
 memberuid: user592_org2_test
 memberuid: user410_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11968,6 +12111,7 @@ memberuid: user234_org9_test
 memberuid: user258_org1_test
 memberuid: user728_org9_test
 memberuid: user1147_org9_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11975,6 +12119,7 @@ dn: cn=pi_user608_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user608_org1_test
 gidnumber: 10070
 memberuid: user608_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11987,6 +12132,7 @@ memberuid: user37_org1_test
 memberuid: user1216_org1_test
 memberuid: user583_org1_test
 memberuid: user838_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -11994,6 +12140,7 @@ dn: cn=pi_user626_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user626_org1_test
 gidnumber: 10107
 memberuid: user626_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12001,6 +12148,7 @@ dn: cn=pi_user635_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user635_org1_test
 gidnumber: 10175
 memberuid: user635_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12009,6 +12157,7 @@ cn: pi_user636_org2_test
 gidnumber: 10195
 memberuid: user636_org2_test
 memberuid: user694_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12019,6 +12168,7 @@ memberuid: user641_org1_test
 memberuid: user239_org1_test
 memberuid: user1017_org1_test
 memberuid: user409_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12028,6 +12178,7 @@ gidnumber: 10115
 memberuid: user647_org1_test
 memberuid: user739_org1_test
 memberuid: user800_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12036,6 +12187,7 @@ cn: pi_user656_org1_test
 gidnumber: 10064
 memberuid: user656_org1_test
 memberuid: user80_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12044,6 +12196,7 @@ cn: pi_user659_org1_test
 gidnumber: 10144
 memberuid: user659_org1_test
 memberuid: user265_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12051,6 +12204,7 @@ dn: cn=pi_user663_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user663_org2_test
 gidnumber: 10202
 memberuid: user663_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12062,6 +12216,7 @@ memberuid: user495_org1_test
 memberuid: user319_org1_test
 memberuid: user678_org1_test
 memberuid: user379_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12070,6 +12225,7 @@ cn: pi_user670_org1_test
 gidnumber: 10062
 memberuid: user670_org1_test
 memberuid: user195_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12078,6 +12234,7 @@ cn: pi_user674_org1_test
 gidnumber: 10217
 memberuid: user674_org1_test
 memberuid: user680_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12090,6 +12247,7 @@ memberuid: user62_org1_test
 memberuid: user649_org1_test
 memberuid: user381_org1_test
 memberuid: user1085_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12100,6 +12258,7 @@ memberuid: user677_org1_test
 memberuid: user1294_org1_test
 memberuid: user1161_org1_test
 memberuid: user484_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12125,6 +12284,7 @@ memberuid: user533_org1_test
 memberuid: user524_org1_test
 memberuid: user596_org1_test
 memberuid: user267_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12140,6 +12300,7 @@ memberuid: user352_org1_test
 memberuid: user825_org1_test
 memberuid: user598_org1_test
 memberuid: user618_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12149,6 +12310,7 @@ gidnumber: 10211
 memberuid: user695_org2_test
 memberuid: user705_org2_test
 memberuid: user541_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12158,6 +12320,7 @@ gidnumber: 10075
 memberuid: user699_org1_test
 memberuid: user665_org1_test
 memberuid: user44_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12165,6 +12328,7 @@ dn: cn=pi_user703_org11_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user703_org11_test
 gidnumber: 10207
 memberuid: user703_org11_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12174,6 +12338,7 @@ gidnumber: 10044
 memberuid: user714_org2_test
 memberuid: user760_org2_test
 memberuid: user538_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12183,6 +12348,7 @@ gidnumber: 10200
 memberuid: user717_org2_test
 memberuid: user189_org2_test
 memberuid: user929_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12192,6 +12358,7 @@ gidnumber: 10161
 memberuid: user720_org1_test
 memberuid: user171_org1_test
 memberuid: user470_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12203,6 +12370,7 @@ memberuid: user276_org1_test
 memberuid: user497_org1_test
 memberuid: user811_org1_test
 memberuid: user88_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12211,6 +12379,7 @@ cn: pi_user724_org1_test
 gidnumber: 10045
 memberuid: user724_org1_test
 memberuid: user864_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12219,6 +12388,7 @@ cn: pi_user725_org2_test
 gidnumber: 10198
 memberuid: user725_org2_test
 memberuid: user876_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12227,6 +12397,7 @@ cn: pi_user727_org000000007_test
 gidnumber: 10266
 memberuid: user727_org000000007_test
 memberuid: user1192_org000000007_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12240,6 +12411,7 @@ memberuid: user38_org1_test
 memberuid: user377_org1_test
 memberuid: user224_org1_test
 memberuid: user451_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12251,6 +12423,7 @@ memberuid: user852_org1_test
 memberuid: user971_org1_test
 memberuid: user1139_org1_test
 memberuid: user951_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12304,6 +12477,7 @@ memberuid: user597_org1_test
 memberuid: user139_org1_test
 memberuid: user1026_org1_test
 memberuid: user109_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12311,6 +12485,7 @@ dn: cn=pi_user737_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user737_org1_test
 gidnumber: 10039
 memberuid: user737_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12320,6 +12495,7 @@ gidnumber: 10069
 memberuid: user743_org1_test
 memberuid: user1263_org1_test
 memberuid: user1098_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12329,6 +12505,7 @@ gidnumber: 10022
 memberuid: user744_org1_test
 memberuid: user704_org1_test
 memberuid: user787_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12347,6 +12524,7 @@ memberuid: user627_org1_test
 memberuid: user552_org1_test
 memberuid: user891_org1_test
 memberuid: user1034_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12354,6 +12532,7 @@ dn: cn=pi_user758_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user758_org1_test
 gidnumber: 10278
 memberuid: user758_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12361,6 +12540,7 @@ dn: cn=pi_user764_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user764_org1_test
 gidnumber: 10237
 memberuid: user764_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12382,6 +12562,7 @@ memberuid: user1248_org1_test
 memberuid: user854_org1_test
 memberuid: user984_org1_test
 memberuid: user1157_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12394,6 +12575,7 @@ memberuid: user729_org3_test
 memberuid: user15_org3_test
 memberuid: user417_org3_test
 memberuid: user766_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12402,6 +12584,7 @@ cn: pi_user782_org1_test
 gidnumber: 10059
 memberuid: user782_org1_test
 memberuid: user1162_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12411,6 +12594,7 @@ gidnumber: 10167
 memberuid: user783_org1_test
 memberuid: user1057_org1_test
 memberuid: user991_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12419,6 +12603,7 @@ cn: pi_user784_org1_test
 gidnumber: 10281
 memberuid: user784_org1_test
 memberuid: user228_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12431,6 +12616,7 @@ memberuid: user1160_org1_test
 memberuid: user650_org1_test
 memberuid: user492_org1_test
 memberuid: user1256_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12441,6 +12627,7 @@ memberuid: user786_org1_test
 memberuid: user1146_org1_test
 memberuid: user301_org1_test
 memberuid: user942_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12448,6 +12635,7 @@ dn: cn=pi_user788_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user788_org2_test
 gidnumber: 10191
 memberuid: user788_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12461,6 +12649,7 @@ memberuid: user74_org3_test
 memberuid: user644_org3_test
 memberuid: user231_org3_test
 memberuid: user630_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12468,6 +12657,7 @@ dn: cn=pi_user795_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user795_org1_test
 gidnumber: 10178
 memberuid: user795_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12476,6 +12666,7 @@ cn: pi_user796_org11_test
 gidnumber: 10133
 memberuid: user796_org11_test
 memberuid: user710_org11_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12484,6 +12675,7 @@ cn: pi_user798_org1_test
 gidnumber: 10035
 memberuid: user798_org1_test
 memberuid: user756_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12491,6 +12683,7 @@ dn: cn=pi_user801_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user801_org1_test
 gidnumber: 10271
 memberuid: user801_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12499,6 +12692,7 @@ cn: pi_user803_org1_test
 gidnumber: 10025
 memberuid: user803_org1_test
 memberuid: user1058_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12509,6 +12703,7 @@ memberuid: user805_org3_test
 memberuid: user154_org3_test
 memberuid: user672_org3_test
 memberuid: user673_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12516,6 +12711,7 @@ dn: cn=pi_user809_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user809_org2_test
 gidnumber: 10190
 memberuid: user809_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12528,6 +12724,7 @@ memberuid: user998_org1_test
 memberuid: user581_org1_test
 memberuid: user1142_org1_test
 memberuid: user504_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12535,6 +12732,7 @@ dn: cn=pi_user830_org11_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user830_org11_test
 gidnumber: 10100
 memberuid: user830_org11_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12542,6 +12740,7 @@ dn: cn=pi_user832_org14_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user832_org14_test
 gidnumber: 10268
 memberuid: user832_org14_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12553,6 +12752,7 @@ memberuid: user379_org1_test
 memberuid: user335_org1_test
 memberuid: user701_org1_test
 memberuid: user763_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12560,6 +12760,7 @@ dn: cn=pi_user834_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user834_org2_test
 gidnumber: 10224
 memberuid: user834_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12568,6 +12769,7 @@ cn: pi_user848_org1_test
 gidnumber: 10225
 memberuid: user848_org1_test
 memberuid: user284_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12575,6 +12777,7 @@ dn: cn=pi_user849_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user849_org1_test
 gidnumber: 10160
 memberuid: user849_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12584,6 +12787,7 @@ gidnumber: 10027
 memberuid: user857_org1_test
 memberuid: user1036_org1_test
 memberuid: user708_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12592,6 +12796,7 @@ cn: pi_user859_org1_test
 gidnumber: 10158
 memberuid: user859_org1_test
 memberuid: user96_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12599,6 +12804,7 @@ dn: cn=pi_user865_org000000007_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user865_org000000007_test
 gidnumber: 10221
 memberuid: user865_org000000007_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12606,6 +12812,7 @@ dn: cn=pi_user868_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user868_org1_test
 gidnumber: 10076
 memberuid: user868_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12613,6 +12820,7 @@ dn: cn=pi_user870_org3_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user870_org3_test
 gidnumber: 10233
 memberuid: user870_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12620,6 +12828,7 @@ dn: cn=pi_user872_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user872_org1_test
 gidnumber: 10038
 memberuid: user872_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12627,6 +12836,7 @@ dn: cn=pi_user873_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user873_org2_test
 gidnumber: 10142
 memberuid: user873_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12634,6 +12844,7 @@ dn: cn=pi_user875_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user875_org1_test
 gidnumber: 10185
 memberuid: user875_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12654,6 +12865,7 @@ memberuid: user457_org1_test
 memberuid: user286_org1_test
 memberuid: user884_org1_test
 memberuid: user562_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12661,6 +12873,7 @@ dn: cn=pi_user878_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user878_org2_test
 gidnumber: 10214
 memberuid: user878_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12668,6 +12881,7 @@ dn: cn=pi_user879_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user879_org1_test
 gidnumber: 10037
 memberuid: user879_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12677,6 +12891,7 @@ gidnumber: 10086
 memberuid: user881_org1_test
 memberuid: user1203_org1_test
 memberuid: user220_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12686,6 +12901,7 @@ gidnumber: 10215
 memberuid: user882_org1_test
 memberuid: user941_org1_test
 memberuid: user238_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12695,6 +12911,7 @@ gidnumber: 10029
 memberuid: user885_org1_test
 memberuid: user742_org1_test
 memberuid: user490_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12702,6 +12919,7 @@ dn: cn=pi_user886_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user886_org1_test
 gidnumber: 10121
 memberuid: user886_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12709,6 +12927,7 @@ dn: cn=pi_user890_org3_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user890_org3_test
 gidnumber: 10182
 memberuid: user890_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12716,6 +12935,7 @@ dn: cn=pi_user905_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user905_org1_test
 gidnumber: 10272
 memberuid: user905_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12724,6 +12944,7 @@ cn: pi_user915_org1_test
 gidnumber: 10184
 memberuid: user915_org1_test
 memberuid: user431_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12731,6 +12952,7 @@ dn: cn=pi_user917_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user917_org1_test
 gidnumber: 10280
 memberuid: user917_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12738,6 +12960,7 @@ dn: cn=pi_user928_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user928_org1_test
 gidnumber: 10050
 memberuid: user928_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12745,6 +12968,7 @@ dn: cn=pi_user931_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user931_org1_test
 gidnumber: 10253
 memberuid: user931_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12755,6 +12979,7 @@ memberuid: user933_org2_test
 memberuid: user122_org2_test
 memberuid: user617_org2_test
 memberuid: user1050_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12764,6 +12989,7 @@ gidnumber: 10114
 memberuid: user935_org1_test
 memberuid: user106_org1_test
 memberuid: user115_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12772,6 +12998,7 @@ cn: pi_user936_org1_test
 gidnumber: 10061
 memberuid: user936_org1_test
 memberuid: user831_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12781,6 +13008,7 @@ gidnumber: 10171
 memberuid: user937_org1_test
 memberuid: user1195_org1_test
 memberuid: user356_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12790,6 +13018,7 @@ gidnumber: 10068
 memberuid: user938_org1_test
 memberuid: user907_org1_test
 memberuid: user1153_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12799,6 +13028,7 @@ gidnumber: 10183
 memberuid: user940_org3_test
 memberuid: user299_org3_test
 memberuid: user945_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12809,6 +13039,7 @@ memberuid: user955_org2_test
 memberuid: user802_org2_test
 memberuid: user726_org2_test
 memberuid: user140_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12820,6 +13051,7 @@ memberuid: user31_org1_test
 memberuid: user454_org1_test
 memberuid: user390_org1_test
 memberuid: user1174_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12830,6 +13062,7 @@ memberuid: user962_org1_test
 memberuid: user696_org1_test
 memberuid: user350_org1_test
 memberuid: user624_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12841,6 +13074,7 @@ memberuid: user683_org1_test
 memberuid: user118_org1_test
 memberuid: user981_org1_test
 memberuid: user1159_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12848,6 +13082,7 @@ dn: cn=pi_user968_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user968_org2_test
 gidnumber: 10120
 memberuid: user968_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12860,6 +13095,7 @@ memberuid: user567_org1_test
 memberuid: user455_org1_test
 memberuid: user399_org1_test
 memberuid: user218_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12872,6 +13108,7 @@ memberuid: user408_org2_test
 memberuid: user322_org2_test
 memberuid: user375_org2_test
 memberuid: user985_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12880,6 +13117,7 @@ cn: pi_user1005_org3_test
 gidnumber: 10262
 memberuid: user1005_org3_test
 memberuid: user203_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12888,6 +13126,7 @@ cn: pi_user1009_org1_test
 gidnumber: 10034
 memberuid: user1009_org1_test
 memberuid: user474_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12895,6 +13134,7 @@ dn: cn=pi_user1018_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1018_org2_test
 gidnumber: 10255
 memberuid: user1018_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12905,6 +13145,7 @@ memberuid: user1019_org3_test
 memberuid: user1138_org3_test
 memberuid: user812_org3_test
 memberuid: user646_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12913,6 +13154,7 @@ cn: pi_user1022_org3_test
 gidnumber: 10163
 memberuid: user1022_org3_test
 memberuid: user159_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12924,6 +13166,7 @@ memberuid: user21_org1_test
 memberuid: user161_org1_test
 memberuid: user824_org1_test
 memberuid: user447_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12932,6 +13175,7 @@ cn: pi_user1029_org1_test
 gidnumber: 10148
 memberuid: user1029_org1_test
 memberuid: user903_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12943,6 +13187,7 @@ memberuid: user1061_org1_test
 memberuid: user26_org1_test
 memberuid: user1069_org1_test
 memberuid: user79_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12950,6 +13195,7 @@ dn: cn=pi_user1039_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1039_org1_test
 gidnumber: 10256
 memberuid: user1039_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12959,6 +13205,7 @@ gidnumber: 10030
 memberuid: user1045_org1_test
 memberuid: user740_org1_test
 memberuid: user1154_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12966,6 +13213,7 @@ dn: cn=pi_user1053_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1053_org1_test
 gidnumber: 10258
 memberuid: user1053_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12973,6 +13221,7 @@ dn: cn=pi_user1056_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1056_org2_test
 gidnumber: 10270
 memberuid: user1056_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12988,6 +13237,7 @@ memberuid: user939_org1_test
 memberuid: user19_org1_test
 memberuid: user573_org1_test
 memberuid: user1090_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -12998,6 +13248,7 @@ memberuid: user1076_org1_test
 memberuid: user227_org8_test
 memberuid: user1237_org1_test
 memberuid: user494_org8_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13009,6 +13260,7 @@ memberuid: user709_org2_test
 memberuid: user593_org2_test
 memberuid: user610_org2_test
 memberuid: user525_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13016,6 +13268,7 @@ dn: cn=pi_user1079_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1079_org1_test
 gidnumber: 10159
 memberuid: user1079_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13023,6 +13276,7 @@ dn: cn=pi_user1082_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1082_org1_test
 gidnumber: 10056
 memberuid: user1082_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13030,6 +13284,7 @@ dn: cn=pi_user1101_org14_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1101_org14_test
 gidnumber: 10269
 memberuid: user1101_org14_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13037,6 +13292,7 @@ dn: cn=pi_user1103_org2_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1103_org2_test
 gidnumber: 10240
 memberuid: user1103_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13045,6 +13301,7 @@ cn: pi_user1109_org2_test
 gidnumber: 10192
 memberuid: user1109_org2_test
 memberuid: user520_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13053,6 +13310,7 @@ cn: pi_user1110_org2_test
 gidnumber: 10257
 memberuid: user1110_org2_test
 memberuid: user183_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13065,6 +13323,7 @@ memberuid: user605_org1_test
 memberuid: user1268_org1_test
 memberuid: user506_org1_test
 memberuid: user671_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13072,6 +13331,7 @@ dn: cn=pi_user1118_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1118_org1_test
 gidnumber: 10033
 memberuid: user1118_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13086,6 +13346,7 @@ memberuid: user131_org1_test
 memberuid: user1290_org1_test
 memberuid: user1197_org1_test
 memberuid: user806_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13099,6 +13360,7 @@ memberuid: user1126_org12_test
 memberuid: user1068_org12_test
 memberuid: user686_org12_test
 memberuid: user804_org12_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13106,6 +13368,7 @@ dn: cn=pi_user1128_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1128_org1_test
 gidnumber: 10284
 memberuid: user1128_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13114,6 +13377,7 @@ cn: pi_user1129_org1_test
 gidnumber: 10189
 memberuid: user1129_org1_test
 memberuid: user861_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13121,6 +13385,7 @@ dn: cn=pi_user1130_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1130_org1_test
 gidnumber: 10117
 memberuid: user1130_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13141,6 +13406,7 @@ gidnumber: 10055
 memberuid: user1165_org1_test
 memberuid: user1074_org1_test
 memberuid: user1299_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13148,6 +13414,7 @@ dn: cn=pi_user1171_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1171_org1_test
 gidnumber: 10250
 memberuid: user1171_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13159,6 +13426,7 @@ memberuid: user127_org1_test
 memberuid: user1289_org1_test
 memberuid: user1163_org1_test
 memberuid: user956_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13168,6 +13436,7 @@ gidnumber: 10188
 memberuid: user1176_org1_test
 memberuid: user845_org1_test
 memberuid: user314_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13176,6 +13445,7 @@ cn: pi_user1182_org2_test
 gidnumber: 10128
 memberuid: user1182_org2_test
 memberuid: user1189_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13183,6 +13453,7 @@ dn: cn=pi_user1185_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1185_org1_test
 gidnumber: 10213
 memberuid: user1185_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13190,6 +13461,7 @@ dn: cn=pi_user1187_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1187_org1_test
 gidnumber: 10208
 memberuid: user1187_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13197,6 +13469,7 @@ dn: cn=pi_user13_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user13_org1_test
 gidnumber: 10226
 memberuid: user13_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13205,6 +13478,7 @@ cn: pi_user1191_org2_test
 gidnumber: 10231
 memberuid: user1191_org2_test
 memberuid: user594_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13212,6 +13486,7 @@ dn: cn=pi_user1201_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1201_org1_test
 gidnumber: 10249
 memberuid: user1201_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13220,6 +13495,7 @@ cn: pi_user1227_org1_test
 gidnumber: 10244
 memberuid: user1227_org1_test
 memberuid: user260_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13228,6 +13504,7 @@ cn: pi_user1233_org1_test
 gidnumber: 10273
 memberuid: user1233_org1_test
 memberuid: user465_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13235,6 +13512,7 @@ dn: cn=pi_user1234_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1234_org1_test
 gidnumber: 10282
 memberuid: user1234_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13244,6 +13522,7 @@ gidnumber: 10041
 memberuid: user1235_org3_test
 memberuid: user961_org3_test
 memberuid: user313_org3_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13261,6 +13540,7 @@ memberuid: user77_org2_test
 memberuid: user210_org2_test
 memberuid: user657_org2_test
 memberuid: user69_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13268,6 +13548,7 @@ dn: cn=pi_user1255_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1255_org1_test
 gidnumber: 10146
 memberuid: user1255_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13276,6 +13557,7 @@ cn: pi_user1260_org2_test
 gidnumber: 10043
 memberuid: user1260_org2_test
 memberuid: user1215_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13286,6 +13568,7 @@ memberuid: user1280_org1_test
 memberuid: user1183_org1_test
 memberuid: user1224_org1_test
 memberuid: user1012_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13311,6 +13594,7 @@ memberuid: user47_org1_test
 memberuid: user443_org1_test
 memberuid: user1044_org1_test
 memberuid: user255_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13319,6 +13603,7 @@ cn: pi_user1293_org2_test
 gidnumber: 10265
 memberuid: user1293_org2_test
 memberuid: user537_org2_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
@@ -13326,6 +13611,7 @@ dn: cn=pi_user1298_org1_test,ou=pi_groups,dc=unityhpc,dc=test
 cn: pi_user1298_org1_test
 gidnumber: 10210
 memberuid: user1298_org1_test
+objectclass: unityClusterPIGroup
 objectclass: posixGroup
 objectclass: top
 
diff --git a/tools/docker-dev/identity/unity-cluster-schema.ldif b/tools/docker-dev/identity/unity-cluster-schema.ldif
new file mode 100644
index 000000000..1cd232753
--- /dev/null
+++ b/tools/docker-dev/identity/unity-cluster-schema.ldif
@@ -0,0 +1,12 @@
+dn: cn=unityCluster,cn=schema,cn=config
+objectClass: olcSchemaConfig
+cn: unityCluster
+olcAttributeTypes: ( 1.1.1 NAME 'isDisabled'
+    DESC 'if disabled, systems should pretend this group does not exist'
+    EQUALITY booleanMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+    )
+olcObjectClasses: ( 1.1.2 NAME 'unityClusterPIGroup' SUP top AUXILIARY
+    DESC 'Unity Cluster PI Group'
+    MAY ( isDisabled )
+    )
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
index a967d75fb..c3139ab36 100644
--- a/webroot/admin/pi-mgmt.php
+++ b/webroot/admin/pi-mgmt.php
@@ -44,6 +44,10 @@
             $parent = new UnityGroup($_POST["pi"], $LDAP, $SQL, $MAILER, $WEBHOOK);
             $parent->removeUser($form_user);
             break;
+        case "disable":
+            $group = new UnityGroup(UnityHTTPD::getPostData("pi"), $LDAP, $SQL, $MAILER, $WEBHOOK);
+            $group->disable();
+            break;
     }
 }
 
@@ -113,7 +117,7 @@
     </thead>
     <tbody>
     <?php
-    $owner_uids = $LDAP->getAllPIGroupOwnerUIDs();
+    $owner_uids = $LDAP->getAllNonDisabledPIGroupOwnerUIDs();
     $owner_attributes = $LDAP->getUsersAttributes(
         $owner_uids,
         ["uid", "gecos", "mail"],
@@ -129,7 +133,20 @@
                 <td>$gecos</td>
                 <td>$gid</td>
                 <td>$mail</td>
-                <td></td>
+                <td>
+                    <form
+                        action=''
+                        method='POST'
+                        onsubmit='
+                            return confirm(\"Are you sure you want to disable group $gid?\")
+                        '
+                    >
+                        $CSRFTokenHiddenFormInput
+                        <input type='hidden' name='form_type' value='disable'>
+                        <input type='hidden' name='pi' value='$gid'>
+                        <input type='submit' value='Disable Group'>
+                    </form>
+                </td>
             </tr>
         ";
     }
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
index c3f158ad0..eb2eec205 100644
--- a/webroot/panel/pi.php
+++ b/webroot/panel/pi.php
@@ -33,6 +33,10 @@
             $group->removeUser($form_user);
 
             break;
+        case "disable":
+            $group->disable();
+            UnityHTTPD::redirect(getURL("panel/account.php"));
+            break; /** @phpstan-ignore deadCode.unreachable */
     }
 }
 
@@ -135,8 +139,23 @@
     echo "</td>";
     echo "</tr>";
 }
-echo "</tbody>";
-echo "</table>";
+
+echo "
+    </tbody>
+    </table>
+    <hr>
+    <h2>Danger Zone</h2>
+    <form
+        action=''
+        method='POST'
+        onsubmit='return confirm(\"Are you sure you want to disable your PI group?\")'
+    >
+        $CSRFTokenHiddenFormInput
+        <input type='hidden' name='form_type' value='disable'>
+        <input type='submit' value='Disable PI Account'>
+    </form>
+";
+
 ?>
 
 <script>
diff --git a/workers/group_user_request_owner_reminder.php b/workers/group_user_request_owner_reminder.php
index f39a3adb4..83c91f48b 100755
--- a/workers/group_user_request_owner_reminder.php
+++ b/workers/group_user_request_owner_reminder.php
@@ -9,7 +9,7 @@
 use UnityWebPortal\lib\UnityGroup;
 
 $today = time();
-$accounts = $LDAP->getAllPIGroups($SQL, $MAILER, $WEBHOOK);
+$accounts = $LDAP->getAllNonDisabledPIGroups($SQL, $MAILER, $WEBHOOK);
 foreach ($accounts as $pi_group) {
     $pi_user = $pi_group->getOwner();
     $requests = $pi_group->getRequests();

From ba7e285bcb3a893579ff4a9e1d4caa5274adecc1 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 14 Jan 2026 13:34:28 -0500
Subject: [PATCH 02/23] update phpunit-bootstrap

---
 test/phpunit-bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
index 9e2234288..c3e25006e 100644
--- a/test/phpunit-bootstrap.php
+++ b/test/phpunit-bootstrap.php
@@ -192,7 +192,7 @@ function ensureUserDoesNotExist(string $uid)
             $flag_group->removeMemberUID($uid);
         }
     }
-    foreach ($LDAP->getPIGroupGIDsWithMemberUID($uid) as $gid) {
+    foreach ($LDAP->getNonDisabledPIGroupGIDsWithMemberUID($uid) as $gid) {
         $pi_group_entry = $LDAP->getPIGroupEntry($gid);
         $pi_group_members = $pi_group_entry->getAttribute("memberuid");
         if (in_array($uid, $pi_group_members)) {

From a0b9701e0f5213f6b386f5c443ef2ba23373a265 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 14 Jan 2026 13:42:33 -0500
Subject: [PATCH 03/23] assert not isPI()

---
 test/functional/PIDisableTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/functional/PIDisableTest.php b/test/functional/PIDisableTest.php
index 19947665b..689630726 100644
--- a/test/functional/PIDisableTest.php
+++ b/test/functional/PIDisableTest.php
@@ -19,6 +19,7 @@ public function testDisableGroupByAdmin()
                 "form_type" => "disable",
                 "pi" => $pi_group->gid,
             ]);
+            $this->assertFalse($pi_group->getOwner()->isPI());
             $this->assertTrue($pi_group->getIsDisabled());
             $this->assertEmpty($pi_group->getMemberUIDs());
             // FIXME uncomment
@@ -44,6 +45,7 @@ public function testDisableGroupByOwner()
         // $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
         try {
             http_post(__DIR__ . "/../../webroot/panel/pi.php", ["form_type" => "disable"]);
+            $this->assertFalse($pi_group->getOwner()->isPI());
             $this->assertTrue($pi_group->getIsDisabled());
             $this->assertEmpty($pi_group->getMemberUIDs());
             // FIXME uncomment

From aa2a2bc1cfb762dbb36d0f9a6196128d530f74b5 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 14 Jan 2026 13:54:14 -0500
Subject: [PATCH 04/23] test cases moved to other PR

---
 test/functional/RegisterUserTest.php | 33 ----------------------------
 1 file changed, 33 deletions(-)

diff --git a/test/functional/RegisterUserTest.php b/test/functional/RegisterUserTest.php
index 10bb663fd..89dc33576 100644
--- a/test/functional/RegisterUserTest.php
+++ b/test/functional/RegisterUserTest.php
@@ -1,8 +1,6 @@
 <?php
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use UnityWebPortal\lib\UnityHTTPDMessageLevel;
-use UnityWebPortal\lib\UserFlag;
 
 class RegisterUserTest extends UnityWebPortalTestCase
 {
@@ -47,35 +45,4 @@ public function testRegisterUserAndCreateOrg($nickname, $expected_uid_gid)
             ensureUserDoesNotExist($uid);
         }
     }
-
-    // FIXME uncomment
-    // public function testResurrectNoDisabledGroup()
-    // {
-    //     global $USER;
-    //     $this->switchUser("GhostNotPI");
-    //     $this->assertTrue($USER->getFlag(UserFlag::GHOST));
-    //     try {
-    //         $this->register();
-    //         $this->assertMessageExists(UnityHTTPDMessageLevel::INFO, "/.*/", "/resurrected/");
-    //         $this->assertFalse($USER->getFlag(UserFlag::GHOST));
-    //     } finally {
-    //         $USER->setFlag(UserFlag::GHOST, true);
-    //     }
-    // }
-
-    // public function testResurrectWithDisabledGroup()
-    // {
-    //     global $USER;
-    //     $this->switchUser("GhostOwnerOfDisabledPIGroup");
-    //     $this->assertTrue($USER->getFlag(UserFlag::GHOST));
-    //     $this->assertFalse($USER->isPI());
-    //     try {
-    //         $this->register();
-    //         $this->assertMessageExists(UnityHTTPDMessageLevel::INFO, "/.*/", "/resurrected/");
-    //         $this->assertFalse($USER->getFlag(UserFlag::GHOST));
-    //         $this->assertFalse($USER->isPI());
-    //     } finally {
-    //         $USER->setFlag(UserFlag::GHOST, true);
-    //     }
-    // }
 }

From 742bd5e20515330475ce2f623dcb42eb0c68e256 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 14 Jan 2026 13:59:48 -0500
Subject: [PATCH 05/23] fix nickname

---
 test/functional/PIBecomeApproveTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/PIBecomeApproveTest.php b/test/functional/PIBecomeApproveTest.php
index d4160a4fa..264b57a62 100644
--- a/test/functional/PIBecomeApproveTest.php
+++ b/test/functional/PIBecomeApproveTest.php
@@ -79,7 +79,7 @@ public function testApprovePI()
     public function testReenableGroup()
     {
         global $USER, $SSO, $LDAP, $SQL, $MAILER, $WEBHOOK;
-        $this->switchUser("ResurrectedOwnerOfDisabledPIGroup");
+        $this->switchUser("ReenabledOwnerOfDisabledPIGroup");
         $this->assertFalse($USER->isPI());
         $user = $USER;
         $pi_group = $USER->getPIGroup();

From 4b3d4edc11e83800a34d918b749899b92f3643c0 Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:16:47 -0500
Subject: [PATCH 06/23] Update resources/mail/group_reenabled.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 resources/mail/group_reenabled.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/mail/group_reenabled.php b/resources/mail/group_reenabled.php
index 12b4da169..1d4bba4d5 100644
--- a/resources/mail/group_reenabled.php
+++ b/resources/mail/group_reenabled.php
@@ -6,7 +6,7 @@
 <p>Hello,</p>
 
 <p>
-Your PI group, <?php echo $data["group_name"]; ?>, has been reenabled on the UnityHPC Platform.
+Your PI group, <?php echo $data["group_name"]; ?>, has been re-enabled on the UnityHPC Platform.
 </p>
 
 <p>If you believe this to be a mistake, please reply to this email</p>

From bf069d0aeca70c8e2f41c78ca2a484d7b39d5ffa Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:16:55 -0500
Subject: [PATCH 07/23] Update resources/lib/UnityGroup.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 resources/lib/UnityGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index 147e78a77..a53826bf6 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -78,7 +78,7 @@ public function disable(bool $send_mail = true): void
         if (count($memberuids) > 0) {
             $this->entry->setAttribute("memberuid", []);
         }
-        // TODO optimmize
+        // TODO optimize
         // UnityUser::__construct() makes one LDAP query for each user
         // updateIsQualified() makes one LDAP query for each member
         // if user is no longer in any PI group, disqualify them

From 0c34a1f1898bbf65c1bb20fa33341b880266b760 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 14 Jan 2026 14:21:13 -0500
Subject: [PATCH 08/23] handle double click, send messages

---
 resources/lib/UnityGroup.php | 6 ++++++
 webroot/admin/pi-mgmt.php    | 5 +++++
 webroot/panel/pi.php         | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index a53826bf6..dcfb59ab3 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -65,6 +65,9 @@ public function requestGroup(?bool $send_mail_to_admins = null, bool $send_mail
 
     public function disable(bool $send_mail = true): void
     {
+        if ($this->getIsDisabled()) {
+            throw new Exception("cannot disable an already disabled group");
+        }
         $this->SQL->addLog("disable_pi_group", $this->gid);
         $memberuids = $this->getMemberUIDs();
         if ($send_mail) {
@@ -91,6 +94,9 @@ public function disable(bool $send_mail = true): void
 
     private function reenable(bool $send_mail = true)
     {
+        if (!$this->getIsDisabled()) {
+            throw new Exception("cannot re-enable a group that is not disabled");
+        }
         $this->SQL->addLog("reenabled_pi_group", $this->gid);
         if ($send_mail) {
             $this->MAILER->sendMail($this->getOwner()->getMail(), "group_reenabled", [
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
index c3139ab36..7adac2136 100644
--- a/webroot/admin/pi-mgmt.php
+++ b/webroot/admin/pi-mgmt.php
@@ -46,7 +46,12 @@
             break;
         case "disable":
             $group = new UnityGroup(UnityHTTPD::getPostData("pi"), $LDAP, $SQL, $MAILER, $WEBHOOK);
+            if ($group->getIsDisabled()) {
+                UnityHTTPD::messageError("Cannot Disable PI Group", "Group is already disabled");
+                UnityHTTPD::redirect();
+            }
             $group->disable();
+            UnityHTTPD::messageSuccess("Group Disabled", "");
             break;
     }
 }
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
index eb2eec205..d1f97d813 100644
--- a/webroot/panel/pi.php
+++ b/webroot/panel/pi.php
@@ -34,7 +34,12 @@
 
             break;
         case "disable":
+            if ($group->getIsDisabled()) {
+                UnityHTTPD::messageError("Cannot Disable PI Group", "Group is already disabled");
+                UnityHTTPD::redirect();
+            }
             $group->disable();
+            UnityHTTPD::messageSuccess("Group Disabled", "");
             UnityHTTPD::redirect(getURL("panel/account.php"));
             break; /** @phpstan-ignore deadCode.unreachable */
     }

From 8c0c5c765747908134d78c0431c1eadacdd602a0 Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:22:10 -0500
Subject: [PATCH 09/23] Update resources/mail/group_reenabled.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 resources/mail/group_reenabled.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/mail/group_reenabled.php b/resources/mail/group_reenabled.php
index 1d4bba4d5..b4fa10f25 100644
--- a/resources/mail/group_reenabled.php
+++ b/resources/mail/group_reenabled.php
@@ -9,4 +9,4 @@
 Your PI group, <?php echo $data["group_name"]; ?>, has been re-enabled on the UnityHPC Platform.
 </p>
 
-<p>If you believe this to be a mistake, please reply to this email</p>
+<p>If you believe this to be a mistake, please reply to this email.</p>

From dddaa98f80421da1ec42a1e4df665c88d6f5f309 Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Wed, 14 Jan 2026 14:23:07 -0500
Subject: [PATCH 10/23] Update
 tools/docker-dev/identity/unity-cluster-schema.ldif

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 tools/docker-dev/identity/unity-cluster-schema.ldif | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/docker-dev/identity/unity-cluster-schema.ldif b/tools/docker-dev/identity/unity-cluster-schema.ldif
index 1cd232753..b724663e4 100644
--- a/tools/docker-dev/identity/unity-cluster-schema.ldif
+++ b/tools/docker-dev/identity/unity-cluster-schema.ldif
@@ -5,6 +5,7 @@ olcAttributeTypes: ( 1.1.1 NAME 'isDisabled'
     DESC 'if disabled, systems should pretend this group does not exist'
     EQUALITY booleanMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+    SINGLE-VALUE
     )
 olcObjectClasses: ( 1.1.2 NAME 'unityClusterPIGroup' SUP top AUXILIARY
     DESC 'Unity Cluster PI Group'

From ac536dfbcf85a9b0bea868571b38291af2961b6e Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 14 Jan 2026 14:24:51 -0500
Subject: [PATCH 11/23] handle edge case no members

---
 resources/lib/UnityGroup.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index dcfb59ab3..d644c7478 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -73,9 +73,11 @@ public function disable(bool $send_mail = true): void
         if ($send_mail) {
             $member_attributes = $this->LDAP->getUsersAttributes($memberuids, ["mail"]);
             $member_mails = array_map(fn($x) => $x["mail"][0], $member_attributes);
-            $this->MAILER->sendMail($member_mails, "group_disabled", [
-                "group_name" => $this->gid,
-            ]);
+            if (count($member_mails) > 0) {
+                $this->MAILER->sendMail($member_mails, "group_disabled", [
+                    "group_name" => $this->gid,
+                ]);
+            }
         }
         $this->setIsDisabled(true);
         if (count($memberuids) > 0) {

From 6155debc6f4122559712f96434d45d0da89c735e Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Thu, 15 Jan 2026 10:52:51 -0500
Subject: [PATCH 12/23] fix test

---
 test/functional/PIDisableTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/PIDisableTest.php b/test/functional/PIDisableTest.php
index 689630726..a031853c4 100644
--- a/test/functional/PIDisableTest.php
+++ b/test/functional/PIDisableTest.php
@@ -114,6 +114,7 @@ public function testPIMgmtShowsBothGroupsWithDisabledAttributeSetFalseAndUnset()
         $pi_group = $USER->getPIGroup();
         $entry = $LDAP->getPIGroupEntry($pi_group->gid);
         $this->assertEquals([], $entry->getAttribute("isDisabled"));
+        $this->switchUser("Admin");
         $this->assertStringContainsString(
             $pi_group->gid,
             http_get(__DIR__ . "/../../webroot/admin/pi-mgmt.php"),

From 6cc9ee7279c451d397389edff1ad627f93d5ca18 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 16 Jan 2026 10:12:24 -0500
Subject: [PATCH 13/23] Revert "comment out functions not yet implemented"

This reverts commit 8b797d74ff20eafd0a40d0397591d09d7e9c5246.
---
 resources/lib/UnityGroup.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index d644c7478..a2709e70d 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -87,11 +87,10 @@ public function disable(bool $send_mail = true): void
         // UnityUser::__construct() makes one LDAP query for each user
         // updateIsQualified() makes one LDAP query for each member
         // if user is no longer in any PI group, disqualify them
-        // FIXME uncomment
-        // foreach ($memberuids as $uid) {
-        //     $user = new UnityUser($uid, $this->LDAP, $this->SQL, $this->MAILER, $this->WEBHOOK);
-        //     $user->updateIsQualified($send_mail);
-        // }
+        foreach ($memberuids as $uid) {
+            $user = new UnityUser($uid, $this->LDAP, $this->SQL, $this->MAILER, $this->WEBHOOK);
+            $user->updateIsQualified($send_mail);
+        }
     }
 
     private function reenable(bool $send_mail = true)
@@ -110,8 +109,7 @@ private function reenable(bool $send_mail = true)
         if (!$this->memberUIDExists($owner_uid)) {
             $this->addMemberUID($owner_uid);
         }
-        // FIXME uncomment
-        // $this->getOwner()->updateIsQualified($send_mail);
+        $this->getOwner()->updateIsQualified($send_mail);
     }
 
     /**

From fabfef0e62a0071f67271e04c0cbbc533a66b415 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 16 Jan 2026 10:13:06 -0500
Subject: [PATCH 14/23] update function name

---
 workers/update-qualified-users-group.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/workers/update-qualified-users-group.php b/workers/update-qualified-users-group.php
index f2f464f2b..92082b35b 100755
--- a/workers/update-qualified-users-group.php
+++ b/workers/update-qualified-users-group.php
@@ -13,8 +13,10 @@
 $args = $cli->parse($argv, true);
 
 $qualified_list_before = $LDAP->userFlagGroups["qualified"]->getMemberUIDs();
-// FIXME getAllNonDefunctPIGroupsAttributes
-$pi_groups_attributes = $LDAP->getAllPIGroupsAttributes(["memberuid"], ["memberuid" => []]);
+$pi_groups_attributes = $LDAP->getAllNonDefunctPIGroupsAttributes(
+    ["memberuid"],
+    ["memberuid" => []],
+);
 $users_with_at_least_one_group = array_merge(
     ...array_map(fn($x) => $x["memberuid"], $pi_groups_attributes),
 );

From a9df825387a72e970623cb07743f6af2dec2c90c Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 16 Jan 2026 10:13:59 -0500
Subject: [PATCH 15/23] uncomment

---
 test/functional/PIDisableTest.php | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/test/functional/PIDisableTest.php b/test/functional/PIDisableTest.php
index a031853c4..758161e89 100644
--- a/test/functional/PIDisableTest.php
+++ b/test/functional/PIDisableTest.php
@@ -11,8 +11,7 @@ public function testDisableGroupByAdmin()
         $memberuids_before = $pi_group->getMemberUIDs();
         $this->assertFalse($pi_group->getIsDisabled());
         $this->assertNotEmpty($pi_group->getMemberUIDs());
-        // FIXME uncomment
-        // $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+        $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
         try {
             $this->switchUser("Admin");
             http_post(__DIR__ . "/../../webroot/admin/pi-mgmt.php", [
@@ -22,14 +21,12 @@ public function testDisableGroupByAdmin()
             $this->assertFalse($pi_group->getOwner()->isPI());
             $this->assertTrue($pi_group->getIsDisabled());
             $this->assertEmpty($pi_group->getMemberUIDs());
-            // FIXME uncomment
-            // $this->assertFalse($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+            $this->assertFalse($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
         } finally {
             $entry = $LDAP->getPIGroupEntry($pi_group->gid);
             $entry->setAttribute("memberuid", $memberuids_before);
             $entry->setAttribute("isDisabled", "FALSE");
-            // FIXME uncomment
-            // $pi_group->getOwner()->setFlag(UserFlag::QUALIFIED, true);
+            $pi_group->getOwner()->setFlag(UserFlag::QUALIFIED, true);
         }
     }
 
@@ -41,15 +38,13 @@ public function testDisableGroupByOwner()
         $memberuids_before = $pi_group->getMemberUIDs();
         $this->assertFalse($pi_group->getIsDisabled());
         $this->assertNotEmpty($pi_group->getMemberUIDs());
-        // FIXME uncomment
-        // $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+        $this->assertTrue($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
         try {
             http_post(__DIR__ . "/../../webroot/panel/pi.php", ["form_type" => "disable"]);
             $this->assertFalse($pi_group->getOwner()->isPI());
             $this->assertTrue($pi_group->getIsDisabled());
             $this->assertEmpty($pi_group->getMemberUIDs());
-            // FIXME uncomment
-            // $this->assertFalse($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
+            $this->assertFalse($pi_group->getOwner()->getFlag(UserFlag::QUALIFIED));
         } finally {
             $entry = $LDAP->getPIGroupEntry($pi_group->gid);
             $entry->setAttribute("memberuid", $memberuids_before);
@@ -63,26 +58,22 @@ public function testMemberBecomesUnqualified()
         global $USER, $LDAP;
         $this->switchUser("Blank");
         $new_user = $USER;
-        // FIXME uncomment
-        // $this->assertFalse($new_user->getFlag(UserFlag::QUALIFIED));
+        $this->assertFalse($new_user->getFlag(UserFlag::QUALIFIED));
         $this->switchUser("EmptyPIGroupOwner");
         $pi_group = $USER->getPIGroup();
         $memberuids_before = $pi_group->getMemberUIDs();
         try {
             $pi_group->newUserRequest($new_user);
             $pi_group->approveUser($new_user);
-            // FIXME uncomment
-            // $this->assertTrue($new_user->getFlag(UserFlag::QUALIFIED));
+            $this->assertTrue($new_user->getFlag(UserFlag::QUALIFIED));
             http_post(__DIR__ . "/../../webroot/panel/pi.php", ["form_type" => "disable"]);
-            // FIXME uncomment
-            // $this->assertFalse($new_user->getFlag(UserFlag::QUALIFIED));
+            $this->assertFalse($new_user->getFlag(UserFlag::QUALIFIED));
         } finally {
             $entry = $LDAP->getPIGroupEntry($pi_group->gid);
             $entry->setAttribute("memberuid", $memberuids_before);
             $entry->setAttribute("isDisabled", "FALSE");
             $pi_group->getOwner()->setFlag(UserFlag::QUALIFIED, true);
-            // FIXME uncomment
-            // $new_user->setFlag(UserFlag::QUALIFIED, false);
+            $new_user->setFlag(UserFlag::QUALIFIED, false);
         }
     }
 

From 74a75a63163d3ba0e8d3aa71a14467e9c073fa54 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 16 Jan 2026 10:15:05 -0500
Subject: [PATCH 16/23] fix function name

---
 workers/update-qualified-users-group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workers/update-qualified-users-group.php b/workers/update-qualified-users-group.php
index 92082b35b..03b41c2fc 100755
--- a/workers/update-qualified-users-group.php
+++ b/workers/update-qualified-users-group.php
@@ -13,7 +13,7 @@
 $args = $cli->parse($argv, true);
 
 $qualified_list_before = $LDAP->userFlagGroups["qualified"]->getMemberUIDs();
-$pi_groups_attributes = $LDAP->getAllNonDefunctPIGroupsAttributes(
+$pi_groups_attributes = $LDAP->getAllNonDisabledPIGroupsAttributes(
     ["memberuid"],
     ["memberuid" => []],
 );

From 63cfaf3c4846b0a1371084f61a3c4ac9c5db3b7e Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 16 Jan 2026 14:24:23 -0500
Subject: [PATCH 17/23] rename variable

---
 resources/lib/UnityLDAP.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lib/UnityLDAP.php b/resources/lib/UnityLDAP.php
index f314a3b30..0b7e62e3b 100644
--- a/resources/lib/UnityLDAP.php
+++ b/resources/lib/UnityLDAP.php
@@ -32,7 +32,7 @@ class UnityLDAP extends LDAPConn
     ];
 
     // isDisabled unset or set to "FALSE"
-    private static string $NON_DEFUNCT_FILTER = "(|(!(isDisabled=*))(isDisabled=FALSE))";
+    private static string $NON_DISABLED_FILTER = "(|(!(isDisabled=*))(isDisabled=FALSE))";
 
     private string $custom_mappings_path =
         __DIR__ . "/../../" . CONFIG["ldap"]["custom_user_mappings_dir"];
@@ -204,7 +204,7 @@ public function getAllNonDisabledPIGroups(
         $pi_groups_attributes = $this->pi_groupOU->getChildrenArrayStrict(
             attributes: ["cn"],
             recursive: false,
-            filter: self::$NON_DEFUNCT_FILTER,
+            filter: self::$NON_DISABLED_FILTER,
         );
         foreach ($pi_groups_attributes as $attributes) {
             array_push(
@@ -227,7 +227,7 @@ public function getAllNonDisabledPIGroupsAttributes(
         return $this->pi_groupOU->getChildrenArrayStrict(
             $attributes,
             false, // non-recursive
-            self::$NON_DEFUNCT_FILTER,
+            self::$NON_DISABLED_FILTER,
             $default_values,
         );
     }
@@ -243,7 +243,7 @@ public function getNonDisabledPIGroupGIDsWithMemberUID(string $uid): array
                 sprintf(
                     "(&(memberuid=%s)%s)",
                     ldap_escape($uid, flags: LDAP_ESCAPE_FILTER),
-                    self::$NON_DEFUNCT_FILTER,
+                    self::$NON_DISABLED_FILTER,
                 ),
             ),
         );

From 4e1c2055b57a3fe0dbce1414f5b58e9e17b9a84c Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 16 Jan 2026 14:24:58 -0500
Subject: [PATCH 18/23] remove comment

---
 resources/mail/group_reenabled.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/mail/group_reenabled.php b/resources/mail/group_reenabled.php
index b4fa10f25..b3d15598f 100644
--- a/resources/mail/group_reenabled.php
+++ b/resources/mail/group_reenabled.php
@@ -1,6 +1,5 @@
 <?php
 
-// This template is sent to the group owner when that group is re-enabled
 $this->Subject = "PI Group Re-Enabled"; ?>
 
 <p>Hello,</p>

From 4fee066b6577acdf302cd927f61dbeac721aba4e Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Tue, 20 Jan 2026 16:18:34 -0500
Subject: [PATCH 19/23] remove dangling reference

---
 webroot/panel/modal/new_pi.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webroot/panel/modal/new_pi.php b/webroot/panel/modal/new_pi.php
index 1c8e5677e..27f52b444 100644
--- a/webroot/panel/modal/new_pi.php
+++ b/webroot/panel/modal/new_pi.php
@@ -7,7 +7,7 @@
 
 // cache PI group info in $_SESSION for ajax pi_search.php
 // cache persists only until the user loads this page again
-$owner_uids = $LDAP->getAllPIGroupOwnerUIDs();
+$owner_uids = $LDAP->getAllNonDisabledPIGroupOwnerUIDs();
 $owner_attributes = $LDAP->getUsersAttributes(
     $owner_uids,
     ["uid", "gecos", "mail"],

From 84a390d4ee403880430c446f2639635b8353bc22 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 21 Jan 2026 15:28:58 -0500
Subject: [PATCH 20/23] fix bugs

---
 resources/lib/UnityGroup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index a2709e70d..4e40de4b6 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -93,7 +93,7 @@ public function disable(bool $send_mail = true): void
         }
     }
 
-    private function reenable(bool $send_mail = true)
+    private function reenable(bool $send_mail = true): void
     {
         if (!$this->getIsDisabled()) {
             throw new Exception("cannot re-enable a group that is not disabled");
@@ -417,7 +417,7 @@ public function getIsDisabled(): bool
                 throw new \RuntimeException(
                     sprintf(
                         "expected value of length 0 or 1, found value %s of length %s",
-                        jsonEncode($value),
+                        _json_encode($value),
                         count($value),
                     ),
                 );

From 4dd4ec0d9519405d90dfafb40b4228228b4043d4 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 21 Jan 2026 15:31:15 -0500
Subject: [PATCH 21/23] cast for phpstan

---
 resources/lib/UnityGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
index 4e40de4b6..3c8cbe445 100644
--- a/resources/lib/UnityGroup.php
+++ b/resources/lib/UnityGroup.php
@@ -72,7 +72,7 @@ public function disable(bool $send_mail = true): void
         $memberuids = $this->getMemberUIDs();
         if ($send_mail) {
             $member_attributes = $this->LDAP->getUsersAttributes($memberuids, ["mail"]);
-            $member_mails = array_map(fn($x) => $x["mail"][0], $member_attributes);
+            $member_mails = array_map(fn($x) => (string) $x["mail"][0], $member_attributes);
             if (count($member_mails) > 0) {
                 $this->MAILER->sendMail($member_mails, "group_disabled", [
                     "group_name" => $this->gid,

From 34d3801f8566daa5e7da5674b9caaf26febedd02 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 21 Jan 2026 15:42:48 -0500
Subject: [PATCH 22/23] cast for phpstan

---
 resources/lib/UnityLDAP.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lib/UnityLDAP.php b/resources/lib/UnityLDAP.php
index 0b7e62e3b..b10be5eee 100644
--- a/resources/lib/UnityLDAP.php
+++ b/resources/lib/UnityLDAP.php
@@ -253,7 +253,7 @@ public function getNonDisabledPIGroupGIDsWithMemberUID(string $uid): array
     public function getAllNonDisabledPIGroupOwnerUIDs(): array
     {
         return array_map(
-            fn($x) => UnityGroup::GID2OwnerUID($x["cn"][0]),
+            fn($x) => (string) UnityGroup::GID2OwnerUID($x["cn"][0]),
             $this->getAllNonDisabledPIGroupsAttributes(["cn"]),
         );
     }

From 68abc99d2c3a04400f5334f547174b35fc7f9a03 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 21 Jan 2026 15:44:01 -0500
Subject: [PATCH 23/23] cast different

---
 resources/lib/UnityLDAP.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lib/UnityLDAP.php b/resources/lib/UnityLDAP.php
index 5e85d596a..241468581 100644
--- a/resources/lib/UnityLDAP.php
+++ b/resources/lib/UnityLDAP.php
@@ -257,7 +257,7 @@ public function getNonDisabledPIGroupGIDsWithMemberUID(string $uid): array
     public function getAllNonDisabledPIGroupOwnerUIDs(): array
     {
         return array_map(
-            fn($x) => (string) UnityGroup::GID2OwnerUID($x["cn"][0]),
+            fn($x) => UnityGroup::GID2OwnerUID((string) $x["cn"][0]),
             $this->getAllNonDisabledPIGroupsAttributes(["cn"]),
         );
     }