ForgotPassword bug fix
Navigation fix for forgotPassword flow