fix using saved tokens instead of session