CHANGE: add validations in User