Make additional authenticators optional + improve logging on authentication handling (OMS-556)