Updated client id retrieval