597 add form flow fixes

closes #597
let's add some text here describing what this function does.