Fixing problems with iCloud, which requires an email address as the username