diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 9ff8db637..9842705f1 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -533,7 +533,7 @@ static NSArray *childRecordFields = nil;
         publicParticle = @"";
       path = [NSString stringWithFormat: @"/%@/dav%@/%@/%@/%@/",
                        appName, publicParticle,
-                       [[self ownerInContext: nil] stringByEscapingURL],
+                       [[SOGoUser getEncryptedUsernameIfNeeded:[self ownerInContext: nil] withContext: context] stringByEscapingURL],
                        [[container nameInContainer] stringByEscapingURL],
                        [[self realNameInContainer] stringByEscapingURL]];
       currentDavURL = [self davURL];
diff --git a/SoObjects/SOGo/SOGoPublicBaseFolder.m b/SoObjects/SOGo/SOGoPublicBaseFolder.m
index b26969a62..2e7f7fab7 100644
--- a/SoObjects/SOGo/SOGoPublicBaseFolder.m
+++ b/SoObjects/SOGo/SOGoPublicBaseFolder.m
@@ -32,9 +32,11 @@
           acquire: (BOOL) acquire
 {
   id userFolder;
+  NSString *login;
 
-  if ([key length] > 0 && [SOGoUser userWithLogin: key roles: nil])
-    userFolder = [SOGoUserFolder objectWithName: key inContainer: self];
+  login = [SOGoUser getDecryptedUsernameIfNeeded: key withContext: localContext];
+  if ([key length] > 0 && [SOGoUser userWithLogin: login roles: nil])
+    userFolder = [SOGoUserFolder objectWithName: login inContainer: self];
   else
     userFolder = nil;