Fixed duplicate users issue