Added role validation and check for adding users