Fixed support for client ids.