diff --git a/src/de/steamwar/bungeecore/commands/TeamCommand.java b/src/de/steamwar/bungeecore/commands/TeamCommand.java
index 0b78c386..9a8eedec 100644
--- a/src/de/steamwar/bungeecore/commands/TeamCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TeamCommand.java
@@ -177,7 +177,7 @@ public class TeamCommand extends BasicCommand {
         if(checkTeamName(player, team, args[2]))
             return;
 
-        Team.create(args[1], args[2], user.getId());
+        Team.create(args[1], args[2], user);
         user.setTeam(Team.get(args[1]).getTeamId());
         Message.send("TEAM_CREATE_CREATED", player, args[2]);
     }
diff --git a/src/de/steamwar/bungeecore/sql/Team.java b/src/de/steamwar/bungeecore/sql/Team.java
index 3fd3eab2..1256a1a3 100644
--- a/src/de/steamwar/bungeecore/sql/Team.java
+++ b/src/de/steamwar/bungeecore/sql/Team.java
@@ -52,8 +52,9 @@ public class Team {
         this(rs.getInt("TeamID"), rs.getString("TeamKuerzel"), rs.getString("TeamName"), rs.getString("TeamColor"));
     }
 
-    public static void create(String kuerzel, String name, int leader){
-        SQL.update("INSERT INTO Team (TeamKuerzel, TeamName, TeamLeader) VALUES (?, ?, ?)", kuerzel, name, leader);
+    public static void create(String kuerzel, String name, SteamwarUser user){
+        user.setLeader(true);
+        SQL.update("INSERT INTO Team (TeamKuerzel, TeamName) VALUES (?, ?)", kuerzel, name);
     }
 
     public static Team get(int id){