work with newest auth-flows