Form validation: Minor code cleanup
Merge pull request #3110 from pjackson28/formvalidfix

Form validation: Minor code cleanup