fix for user duplication