re #878 - Fixed server side form validation