diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Calendar.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Calendar.cs
index 3162633ab..a54a15195 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Calendar.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Calendar.cs
@@ -40,7 +40,7 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserCalendar)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
                 if (!string.IsNullOrWhiteSpace(_targetUserId))
                     _targetCalendarId = await GetDefaultRestoreTargetCalendar(_targetUserId, cancel);
             }
@@ -48,7 +48,7 @@ partial class RestoreProvider
             {
                 _targetUserId = target.Metadata.GetValueOrDefault("gsuite:UserId");
                 if (string.IsNullOrWhiteSpace(_targetUserId))
-                    _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                    _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
                 _targetCalendarId = target.Metadata.GetValueOrDefault("gsuite:Id");
             }
             else
diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Chat.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Chat.cs
index 65659393d..ab95b7319 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Chat.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Chat.cs
@@ -35,7 +35,7 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserChat)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
             }
             else if (target.Type == SourceItemType.ChatSpace)
             {
diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Contacts.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Contacts.cs
index aacae67ec..4ce2822ac 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Contacts.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Contacts.cs
@@ -33,7 +33,7 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserContacts)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
             }
             else
             {
diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Drive.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Drive.cs
index 0b4c1d541..02aff977b 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Drive.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Drive.cs
@@ -41,7 +41,7 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserDrive)
             {
-                userId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                userId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
             }
             else
             {
@@ -387,7 +387,7 @@ partial class RestoreProvider
         }
         else if (RestoreTarget.Type == SourceItemType.UserDrive)
         {
-            userId = RestoreTarget.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+            userId = RestoreTarget.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
         }
         else if (RestoreTarget.Type == SourceItemType.DriveFolder)
         {
@@ -464,7 +464,7 @@ partial class RestoreProvider
         }
         else if (RestoreTarget.Type == SourceItemType.UserDrive)
         {
-            userId = RestoreTarget.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+            userId = RestoreTarget.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
         }
         else if (RestoreTarget.Type == SourceItemType.DriveFolder)
         {
@@ -684,7 +684,7 @@ partial class RestoreProvider
         }
         else if (RestoreTarget.Type == SourceItemType.UserDrive)
         {
-            userId = RestoreTarget.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+            userId = RestoreTarget.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
         }
         else if (RestoreTarget.Type == SourceItemType.DriveFolder)
         {
diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Gmail.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Gmail.cs
index afda27660..cd32e98ea 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Gmail.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Gmail.cs
@@ -40,14 +40,14 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserGmail)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
                 if (string.IsNullOrWhiteSpace(_targetUserId))
                     throw new InvalidOperationException("User ID is not set");
                 _targetLabelId = await GetDefaultRestoreTargetLabel(_targetUserId, cancel);
             }
             else if (target.Type == SourceItemType.GmailLabel)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
                 _targetLabelId = target.Metadata.GetValueOrDefault("gsuite:Id");
             }
             else
diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Keep.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Keep.cs
index 0203012dd..6ca383cc0 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Keep.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Keep.cs
@@ -34,7 +34,7 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserKeep)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
             }
             else
             {
diff --git a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Tasks.cs b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Tasks.cs
index 6cbb5abb7..a3c601414 100644
--- a/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Tasks.cs
+++ b/proprietary/GoogleWorkspace/RestoreProvider/RestoreProvider.Tasks.cs
@@ -33,7 +33,7 @@ partial class RestoreProvider
             }
             else if (target.Type == SourceItemType.UserTasks)
             {
-                _targetUserId = target.Path.TrimStart('/').Split('/').Skip(1).FirstOrDefault();
+                _targetUserId = target.Path.TrimStart(Path.DirectorySeparatorChar).Split(Path.DirectorySeparatorChar).Skip(1).FirstOrDefault();
             }
             else if (target.Type == SourceItemType.TaskList)
             {