diff --git a/enzevalos_iphone/MailSession.swift b/enzevalos_iphone/MailSession.swift
index d4aba0bbb16c8d3e5b639855f8aab6c2f2fa992f..6e4cbf9178d4197ea325d6b5d92873c1daba0e99 100644
--- a/enzevalos_iphone/MailSession.swift
+++ b/enzevalos_iphone/MailSession.swift
@@ -525,7 +525,11 @@ class MailSession {
         self.sessionType = sessionType
         if let username = UserManager.loadUserValue(Attribute.accountname) as? String {
             self.username = username
-        }else {
+        }
+        else if let username = UserManager.loadUserValue(Attribute.userAddr) as? String {
+            self.username = username
+        }
+        else {
             throw MailServerConnectionError.AuthenticationError
         }
         if let pw = UserManager.loadUserValue(Attribute.userPW) as? String {