Form validation tweak