diff --git a/actions/delete-ldap-user b/actions/delete-ldap-user
index 8671560b3..2038e998f 100755
--- a/actions/delete-ldap-user
+++ b/actions/delete-ldap-user
@@ -28,3 +28,19 @@ else
     echo "Failed: user delete failed"
     exit 1
 fi
+
+cat <<EOF |ldapmodify -Y EXTERNAL -H ldapi:///
+dn: cn=admin,ou=groups,dc=thisbox
+changetype: modify
+delete: uniqueMember
+uniqueMember: uid=$username,ou=users,dc=thisbox
+EOF
+
+if [ $? -eq 0 ]; then
+    echo "Removed user from admin group"
+elif [ $? -eq 16 ]; then
+    echo "User was not in admin group"
+elif [ $? -eq 65 ]; then
+    echo "Cannot remove last LDAP admin user"
+    exit 2
+fi
diff --git a/actions/rename-ldap-user b/actions/rename-ldap-user
index 8c299a230..6346987bc 100755
--- a/actions/rename-ldap-user
+++ b/actions/rename-ldap-user
@@ -34,3 +34,24 @@ else
     echo "Failed: user rename failed"
     exit 1
 fi
+
+# check if user is admin
+results=$(ldapsearch -Y EXTERNAL -H ldapi:/// -b 'cn=admin,ou=groups,dc=thisbox' -LLL "(uniqueMember=uid=$old_username,ou=users,dc=thisbox)" uniqueMember)
+
+if [ -z "$results" ]; then
+    exit 0
+fi
+
+cat <<EOF |ldapmodify -Y EXTERNAL -H ldapi:///
+dn: cn=admin,ou=groups,dc=thisbox
+changetype: modify
+add: uniqueMember
+uniqueMember: uid=$new_username,ou=users,dc=thisbox
+EOF
+
+cat <<EOF |ldapmodify -Y EXTERNAL -H ldapi:///
+dn: cn=admin,ou=groups,dc=thisbox
+changetype: modify
+delete: uniqueMember
+uniqueMember: uid=$old_username,ou=users,dc=thisbox
+EOF