Client id scope issue fix (caused crash)