fix password checking
Merge branch 'password_reset'