Keep invalid statements in the form

* Also tweak validation message a bit for invalid statement