Fixed form validation issue