Deal with spaces in client name.