Minor fixes to email system
Merge pull request #1345 from codecombat/master

Minor fixes to email system