Changes to forgot password workflow