fixed password reset
Merge pull request #155 from cdallas/master

password reset