diff --git a/src/Test/conftest.py b/src/Test/conftest.py
index 848ed770..2ac61c0d 100644
--- a/src/Test/conftest.py
+++ b/src/Test/conftest.py
@@ -218,6 +218,8 @@ def site_temp(request):
 @pytest.fixture(scope="session")
 def user():
     user = UserManager.user_manager.get()
+    if not user:
+        user = UserManager.user_manager.create()
     user.sites = {}  # Reset user data
     return user