On wizard, if username has @, don't add provider address in email address. Fixes...