Fix password reset
Merge branch 'master' of github.com:nickyhajal/world-domination-summit