Merge pull request #1361 from akoeplinger/fix-forms