Fix add client selection