Merge branch 'hotfix/1.0.4'
Fix email rendering
Merge branch 'hotfix/1.0.5' into develop
Add support for requiring users to change their password and refactor code