Tweak form validation to match updated form