Fixed the setting of the client options

Options should be merged with the existing configuration of the client
instead of overwriting the whole config