Wow, emails weren't done O_o
Merge branch 'hotfix/fix_email'