995132: remove double-validation of some form fields