Fix client.properties
Merge client.properties fix