Fix some mailing issues in form controller