Fixed userid and client id mismatch