Fix client_disconnect user and org ids