diff --git a/enzevalos_iphone/AuthenticationScreen.swift b/enzevalos_iphone/AuthenticationScreen.swift
index ea9e3f6bb37b4fc79bc0f5c387329c93ccb4aa4d..d17b3476437407f2bfd97bea6d18d00051e6ffec 100644
--- a/enzevalos_iphone/AuthenticationScreen.swift
+++ b/enzevalos_iphone/AuthenticationScreen.swift
@@ -43,7 +43,7 @@ struct AuthenticationScreen: View {
                             self.viewModel.detailValidation(self.login, self.password, self.username, self.imapServer, self.imapPort, self.imapEncryption, self.smtpServer, self.smtpPort, self.smtpEncryption) :
                             self.viewModel.validate(self.login, self.password)
                         }) {
-                            Text("Button")
+                            Text("Login")
                         }
                     }
                     
@@ -81,7 +81,7 @@ struct AuthenticationScreen: View {
                     }
                     
                     Button(action: { self.viewModel.startGoogleOauth() }) {
-                        Text("Google button")
+                        Text("Google login")
                     }
                     
                 }.padding()
diff --git a/enzevalos_iphone/MailSession.swift b/enzevalos_iphone/MailSession.swift
index 4069cdf813330ffbc814ddc37c185ccb698b70b2..1df6ce70ad5ba706546da5a92236fc7f2e42f9c3 100644
--- a/enzevalos_iphone/MailSession.swift
+++ b/enzevalos_iphone/MailSession.swift
@@ -643,7 +643,7 @@ class MailSession {
         let (_, server) = MailSession.splitAddr(userAddr: self.mailAddr)
         if let domain = server {
             if self.sessionType == SessionType.IMAP {
-                createServers(domain: domain, prefixes: MailSession.IMAPPREFIX, ports: [UInt32(111)])
+                createServers(domain: domain, prefixes: MailSession.IMAPPREFIX, ports: MailSession.IMAPPORT)
             }
             else {
                 createServers(domain: domain, prefixes: MailSession.SMTPPREFIX, ports: MailSession.SMTPPORT)