Only reassign client settings if not nil