Bug fix: form validation logic slightly broken for required and blank values