Add ClientId to client and server