Fixes #17458 - include user group admins
(cherry picked from commit a55d7b6440e42f659d90691340e2e767a4be7e56)
Fixes #17458 - include user group admins
(cherry picked from commit a55d7b6440e42f659d90691340e2e767a4be7e56)