Hot fix form fields validations