fixed
fixed password reset issue
Merge remote branch 'origin/fix_password' into fix_password
Merge pull request #323 from dav3860/fix_password

Fix to #310