A fix for cases like iCloud where the username is an email address

Auto-discovery didn't work correctly for iCloud because the username needs to be an email address. It will now try to authenticate with both just the username, or with username@domain