diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m
index 2a1cc4a10..2df9c9609 100644
--- a/SoObjects/SOGo/SOGoSieveManager.m
+++ b/SoObjects/SOGo/SOGoSieveManager.m
@@ -790,10 +790,10 @@ static NSString *sieveScriptName = @"sogo";
   imapAuthMech = nil;
   if([sd doesLoginTypeByDomain])
   {
-    r = [theUsername rangeOfString: @"@"];
+    r = [authname rangeOfString: @"@"];
     if (r.location != NSNotFound)
     {
-      userDomain = [theUsername substringFromIndex: r.location+1];
+      userDomain = [authname substringFromIndex: r.location+1];
       imapAuthMech = [sd getImapAuthMechForDomain: userDomain];
     }
   }
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index e0c0d810b..a8658e772 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -791,6 +791,7 @@ static SoProduct      *commonProduct      = nil;
   // If the action is 'connect' (or 'logoff'), we let it go as the token
   // needs to be created (or destroyed) during the session initialization
   if ([_actionName isEqualToString: @"connect"] ||
+      [_actionName isEqualToString: @"connectName"] ||
       [_actionName isEqualToString: @"changePassword"] ||
       [_actionName isEqualToString: @"logoff"] ||
       [_actionName isEqualToString: @"passwordRecovery"] ||