Fixed current user displaying
Changed ENUM arrangement