fixed password reset issue
Merge remote branch 'origin/fix_password' into fix_password