Fixing the validation logic for the form. Cleaning up the form error message for the form