Simplfying multi OAuth client handling