Ensure we don't create duplicate users if usernames don't match