Merge "Add restriction to prevent a user being made an admin"