USER in emails for both stage/prod
replace USER with user.username
also the html mail....
Merge branch 'release/0.2.0' into develop