Fix add/remove user