fix user duplication issues