FIX: Fixes #833 fixes after peer review
FIX: Fixes #833 fixes after peer review

silverstripe/silverstripe-userforms,dnadesign/silverstripe-userforms,dnadesign/silverstripe-userforms,silverstripe/silverstripe-userforms