add client id resolve mechanism and user lookup service