Fixed pick and user model validations