Add support for /user/authenticate/ step happening after 3rd party request