Removed unnecessary duplication in user model role checking