Also support 'not authed remotely' case