Fixes to get admins/users working