Changed client_config to not override user defined values