WH-36 - Fixed form double validation bug