Bug fix with duplicate users