Better support for auth code path