Merge pull request #351 from boersmamarcel/pass_reset_token_fix

Marcel said I could...

:)
Merge branch 'master' of github.com:boersmamarcel/challengesplatform into speedup