fixed password reset module
Merge branch 'passwdreset'