Fixed #1112
Update to remove retrigger submit form bug
Merge pull request #1806 from Solution4Future/master

Fixed #1112