Fixes regression bug whereby users can NEVER be made admins/super-admins
(cherry picked from commit 5b2c1b8)