Fixed emailing new users
Merge branch 'master' into dev