Fix problem with duplicate users