Fix $form being overwritten by the form helper
Merge pull request #1108 from Mnkras/fix-auth-forms

Fix $form being overwritten by the form helper