Improved validations on user form