Fix side-effect from last commit that causing infinite loop on oAuth flow