Add form validation (bug 929072)