Fix duplication of users