diff --git a/test/gui/shared/scripts/helpers/SetupClientHelper.py b/test/gui/shared/scripts/helpers/SetupClientHelper.py
index 02216c1162..a591128e0b 100644
--- a/test/gui/shared/scripts/helpers/SetupClientHelper.py
+++ b/test/gui/shared/scripts/helpers/SetupClientHelper.py
@@ -9,7 +9,7 @@
 import squish
 from PySide6.QtCore import QSettings, QUuid, QUrl, QJsonValue
 
-from helpers.SpaceHelper import get_space_id
+from helpers.SpaceHelper import get_space_id, get_personal_space_id
 from helpers.ConfigHelper import get_config, set_config, is_windows
 from helpers.SyncHelper import listen_sync_status_for_item
 from helpers.api.utils import url_join
@@ -156,11 +156,11 @@ def generate_account_config(users, space='Personal'):
         settings.beginWriteArray(str(idx+1),len(users))
 
         if space == 'Personal':
-            dav_endpoint = QUrl(url_join(server_url, '/dav/files', username))
+            space_id = get_personal_space_id(username)
         else:
             space_id = get_space_id(space, username)
-            dav_endpoint = QUrl(url_join(server_url, '/dav/spaces/', space_id))
-            settings.setValue("spaceId", space_id)
+        dav_endpoint = QUrl(url_join(server_url, '/dav/spaces/', space_id))
+        settings.setValue("spaceId", space_id)
         settings.setValue("accountUUID", users_uuids[username])
         settings.setValue("davUrl", dav_endpoint)
         settings.setValue("deployed", 'false')
diff --git a/test/gui/shared/scripts/helpers/SpaceHelper.py b/test/gui/shared/scripts/helpers/SpaceHelper.py
index 8bae24b56a..14d9f73879 100644
--- a/test/gui/shared/scripts/helpers/SpaceHelper.py
+++ b/test/gui/shared/scripts/helpers/SpaceHelper.py
@@ -48,6 +48,10 @@ def get_project_spaces(user=None):
     search_query = '$filter=driveType eq \'project\''
     return fetch_spaces(query=search_query, user=user)
 
+def get_personal_space_id(user):
+    search_query = '$filter=driveType eq \'personal\''
+    space = fetch_spaces(query=search_query, user=user)
+    return space[0]['id']
 
 def get_space_id(space_name, user=None):
     spaces = {**created_spaces, **user_spaces}