keep the client id if user-specified