diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index ff9321f92..d6b854df9 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2644,7 +2644,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              parts in this url. We strip the '-' character in case we have
              this in the domain part - like foo@bar-zot.com */
           ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
-                                           [[user loginInDomain] asCSSIdentifier]];
+                                           [[user login] asCSSIdentifier]];
           [ocFSTableName replaceOccurrencesOfString: @"-"
                                          withString: @"_"
                                             options: 0
diff --git a/OpenChange/MAPIStoreUserContext.m b/OpenChange/MAPIStoreUserContext.m
index 04300fd35..159748519 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -311,9 +311,9 @@ static NSMapTable *contextsTable = nil;
              parts in this url. We strip the '-' character in case we have
              this in the domain part - like foo@bar-zot.com */
           ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
-                                    [[[user loginInDomain] asCSSIdentifier] 
-                                      stringByReplacingOccurrencesOfString: @"-"
-                                                                withString: @"_"]];
+                                    [[[user login] asCSSIdentifier]
+                                     stringByReplacingOccurrencesOfString: @"-"
+                                                               withString: @"_"]];
           [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
           folderTableURL
             = [NSURL URLWithString: [parts componentsJoinedByString: @"/"]];
diff --git a/Tools/SOGoToolManageEAS.m b/Tools/SOGoToolManageEAS.m
index 0d8a7d772..0e01da733 100644
--- a/Tools/SOGoToolManageEAS.m
+++ b/Tools/SOGoToolManageEAS.m
@@ -142,7 +142,7 @@ typedef enum
              parts in this url. We strip the '-' character in case we have
              this in the domain part - like foo@bar-zot.com */
           ocFSTableName = [NSMutableString stringWithFormat: @"sogo_cache_folder_%@",
-                                           [[user loginInDomain] asCSSIdentifier]];
+                                           [[user login] asCSSIdentifier]];
           [ocFSTableName replaceOccurrencesOfString: @"-"
                                          withString: @"_"
                                             options: 0