diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py
index a384c13e..beeaca53 100644
--- a/server/vbv_lernwelt/core/create_default_users.py
+++ b/server/vbv_lernwelt/core/create_default_users.py
@@ -4,6 +4,7 @@ from django.contrib.auth.models import Group, Permission
 from django.core.files import File
 from environs import Env
 
+from vbv_lernwelt.core.model_utils import add_countries
 from vbv_lernwelt.media_files.models import UserImage
 
 env = Env()
@@ -79,7 +80,30 @@ default_users = [
 AVATAR_DIR = settings.APPS_DIR / "static" / "avatars"
 
 
+def create_datatrans_hanna_user():
+    hanna, _ = User.objects.get_or_create(
+        id=TEST_USER_DATATRANS_HANNA_ID,
+    )
+    hanna.username = "datatrans.hanna.vbv@example.com"
+    hanna.email = "datatrans.hanna.vbv@example.com"
+    hanna.language = "de"
+    hanna.first_name = "Hanna"
+    hanna.last_name = "Vbv"
+    hanna.street = "Bahnstrasse"
+    hanna.street_number = "2"
+    hanna.postal_code = "8603"
+    hanna.city = "Schwerzenbach"
+    hanna.country_id = "CH"
+    hanna.birth_date = "1970-01-01"
+    hanna.phone_number = "+41792018586"
+    hanna.password = make_password("test")
+    hanna.save()
+    return hanna
+
+
 def create_default_users(default_password="test", set_avatar=False):
+    add_countries(small_set=True)
+
     admin_group, created = Group.objects.get_or_create(name="admin_group")
     _content_creator_group, _created = Group.objects.get_or_create(
         name="content_creator_grop"
@@ -203,23 +227,7 @@ def create_default_users(default_password="test", set_avatar=False):
         language="de",
     )
 
-    hanna, _ = User.objects.get_or_create(
-        id=TEST_USER_DATATRANS_HANNA_ID,
-    )
-    hanna.username = "datatrans.hanna.vbv@example.com"
-    hanna.email = "datatrans.hanna.vbv@example.com"
-    hanna.language = "de"
-    hanna.first_name = "Hanna"
-    hanna.last_name = "Vbv"
-    hanna.street = "Bahnstrasse"
-    hanna.street_number = "2"
-    hanna.postal_code = "8603"
-    hanna.city = "Schwerzenbach"
-    hanna.country_id = "CH"
-    hanna.birth_date = "1970-01-01"
-    hanna.phone_number = "+41792018586"
-    hanna.password = make_password("test")
-    hanna.save()
+    hanna = create_datatrans_hanna_user()
 
     for user_data in default_users:
         _create_student_user(**user_data)
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index abfae404..1a02a343 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -17,8 +17,10 @@ from vbv_lernwelt.core.constants import (
     TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
     TEST_STUDENT3_USER_ID,
     TEST_TRAINER1_USER_ID,
+    TEST_USER_DATATRANS_HANNA_ID,
     TEST_USER_EMPTY_ID,
 )
+from vbv_lernwelt.core.create_default_users import create_datatrans_hanna_user
 from vbv_lernwelt.core.models import Organisation, User
 from vbv_lernwelt.course.consts import (
     COURSE_TEST_ID,
@@ -159,6 +161,9 @@ def command(
         password=make_password("test"),
     )
 
+    User.objects.filter(id=TEST_USER_DATATRANS_HANNA_ID).delete()
+    create_datatrans_hanna_user()
+
     cursor = connection.cursor()
     cursor.execute("truncate core_securityrequestresponselog;")
     cursor.execute("truncate core_externalapirequestlog;")