fixed the form so that it stores in the proper user
Merge branch 'master' into HaiBranch