Merge "Add condition to check if a user can have profile user"