Bug on form validation
Merge