Silly form switch mistake
Merge pull request #2 from Benrajalu/hotfixes

On to prod.