Fix client id provider problem