ORG-876: update validation form