[GAIA] - Fix for Bug 1036370
Merge pull request #431 from michalbe/Bug946750-form-temp

[GAIA] - Fix for Bug 1036370