Fixed validation on the form elements