#321 - Fix issue with validation on dynamic forms when switching the form type