Fixed duplicate user bug