diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index 8184226202e1e926fdce061ff787f18af2801e10..96a45409af8cd64b8c4b617c4c0301d7e2dc2cf3 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -635,7 +635,7 @@ class Onboarding: NSObject {
             } else if let auth = imapService.info()["auth"] as? String, auth == "xoAuth2Outlook" {
                 UserManager.storeUserValue(MCOAuthType.SASLCRAMMD5.rawValue as AnyObject?, attribute: Attribute.imapAuthType)
             } else {
-                UserManager.storeUserValue(0 as AnyObject?, attribute: Attribute.imapAuthType)
+                UserManager.storeUserValue(MCOAuthType.saslPlain.rawValue as AnyObject?, attribute: Attribute.imapAuthType)
             }
 
             let smtpService = smtp[0]
@@ -671,7 +671,7 @@ class Onboarding: NSObject {
             } else if let auth = smtpService.info()["auth"] as? String, auth == "xoAuth2Outlook" {
                 UserManager.storeUserValue(MCOAuthType.SASLCRAMMD5.rawValue as AnyObject?, attribute: Attribute.smtpAuthType)
             } else {
-                UserManager.storeUserValue(0 as AnyObject?, attribute: Attribute.smtpAuthType)
+                UserManager.storeUserValue(MCOAuthType.saslPlain.rawValue as AnyObject?, attribute: Attribute.smtpAuthType)
             }
             
             if let drafts = provider.draftsFolderPath() {
diff --git a/enzevalos_iphone/UserData.swift b/enzevalos_iphone/UserData.swift
index ef44213184ccd26e83e6a19be835d4adc25496c6..4e38b27807434dd3c8d2ca2c63a4f3cbde3c92d0 100644
--- a/enzevalos_iphone/UserData.swift
+++ b/enzevalos_iphone/UserData.swift
@@ -186,14 +186,14 @@ struct UserManager {
         if let auth = UserManager.loadUserValue(Attribute.imapAuthType) as? Int, auth != 0 {
             return MCOAuthType.init(rawValue: auth)
         }
-        return []
+        return MCOAuthType.saslPlain
     }
 
     static func loadSmtpAuthType() -> MCOAuthType {
         if let auth = UserManager.loadUserValue(Attribute.smtpAuthType) as? Int, auth != 0 {
             return MCOAuthType.init(rawValue: auth)
         }
-        return []
+        return MCOAuthType.saslPlain
     }
 
     static func loadUserSignature() -> String {