Added fix for duplicate users being added