Improve how admin/superadmin is recognized