Updating form validation to support changed form fields