Fix authentication routing to support opt in/out