Fixing user forms.
Merge pull request #512 from ngodfraind/bugfix

Fixing user forms.