Fix for users getting duplicated