ForgotPassword bug fix