597 add form flow fixes

closes #597
why is this needed?