diff --git a/src/de/steamwar/misslewars/listener/JoinListener.java b/src/de/steamwar/misslewars/listener/JoinListener.java
index 73dd5c5..5947da8 100644
--- a/src/de/steamwar/misslewars/listener/JoinListener.java
+++ b/src/de/steamwar/misslewars/listener/JoinListener.java
@@ -57,11 +57,15 @@ public class JoinListener extends BasicListener {
 	}
 
 	private static void joinEvent(Player p) {
-		if (Config.EventTeamRedID == Config.EventTeamBlueID) {
+		if (Config.EventTeamRedID == 0 && Config.EventTeamBlueID == 0) {
 			joinNormal(p);
 			return;
 		}
+
 		int teamId = SteamwarUser.get(p.getUniqueId()).getTeam();
+		if (teamId != Config.EventTeamRedID && teamId != Config.EventTeamBlueID) {
+			teamId = 0;
+		}
 		if (teamId == Config.EventTeamRedID && MissileWars.getRedTeam().size() < Config.MaximumTeamMembers) {
 			MissileWars.getRedTeam().join(p);
 		} else if (teamId == Config.EventTeamBlueID && MissileWars.getBlueTeam().size() < Config.MaximumTeamMembers) {