[ZD#732337] improve form validation