re #878 - Improved form validation