Fixed Users conflicts