Pulled in mailer changes for production, uncommented line 9 of user cont...

...roller