Tweaked form validation