Fixed handling of non-email accounts