Fix #1141 Use form type repeated
Add nicer validation message