Using Form Class validation feature. Fixes rSKbfda8c870537