Made some changes to the form builder to make the submission token work better