Fix for auto-discovery for cases like iCloud where the username is a email address