Fix bugs
Mailer
Users
Merge remote-tracking branch 'origin/userstory83' into userstory83