Hande client names with "." inside them correctly