[master] fixed password recovery issues.