Client Settings Provider fix