597 add form flow fixes

closes #597