diff --git a/konova/management/commands/kspMigrater/base_migrater.py b/konova/management/commands/kspMigrater/base_migrater.py
index 4148aef4..630a3077 100644
--- a/konova/management/commands/kspMigrater/base_migrater.py
+++ b/konova/management/commands/kspMigrater/base_migrater.py
@@ -186,8 +186,10 @@ class BaseMigrater:
         """ Returns a team from given name
 
         """
-        name = f"Team {team_name}"
+        if len(team_name) == 0:
+            return None
 
+        name = f"Team {team_name}"
         description = f"Automatisch erzeugtes Team für {team_name}"
         team = Team.objects.get_or_create(
             name=name,
diff --git a/konova/management/commands/kspMigrater/user_migrater.py b/konova/management/commands/kspMigrater/user_migrater.py
index 49e1e2d2..362e491d 100644
--- a/konova/management/commands/kspMigrater/user_migrater.py
+++ b/konova/management/commands/kspMigrater/user_migrater.py
@@ -87,11 +87,13 @@ class UserMigrater(BaseMigrater):
             if company_team is not None and len(user_teams) == 0:
                 # Only team is the company team
                 company_team.users.add(user)
+                company_team.admins.add(user)
             else:
                 if company_team is not None:
                     company_team.delete()
                 for team in user_teams:
                     team.users.add(user)
+                    team.admins.add(user)
             num_processed += 1
         cursor.close()