Add client id to context