fix #1639 ( "Forgot Password" flow is not working. )