diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 5d5684d53..d6ab05d1c 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -315,8 +315,8 @@ function SET_BASE:_FilterStart()
   self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash )
   
   -- Follow alive players and clients
-  self:HandleEvent( EVENTS.PlayerEnterUnit, self._EventOnPlayerEnterUnit )
-  self:HandleEvent( EVENTS.PlayerLeaveUnit, self._EventOnPlayerLeaveUnit )
+  --self:HandleEvent( EVENTS.PlayerEnterUnit, self._EventOnPlayerEnterUnit )
+  --self:HandleEvent( EVENTS.PlayerLeaveUnit, self._EventOnPlayerLeaveUnit )
   
   
   return self
diff --git a/Moose Development/Moose/Functional/Scoring.lua b/Moose Development/Moose/Functional/Scoring.lua
index 2bfacdb07..8c259f6d5 100644
--- a/Moose Development/Moose/Functional/Scoring.lua	
+++ b/Moose Development/Moose/Functional/Scoring.lua	
@@ -282,7 +282,7 @@ function SCORING:New( GameName )
   self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash )
   self:HandleEvent( EVENTS.Hit, self._EventOnHit )
   self:HandleEvent( EVENTS.Birth )
-  self:HandleEvent( EVENTS.PlayerEnterUnit )
+  --self:HandleEvent( EVENTS.PlayerEnterUnit )
   self:HandleEvent( EVENTS.PlayerLeaveUnit )
   
   -- During mission startup, especially for single player, 
@@ -842,10 +842,26 @@ end
 --- Handles the OnPlayerEnterUnit event for the scoring.
 -- @param #SCORING self
 -- @param Core.Event#EVENTDATA Event
-function SCORING:OnEventPlayerEnterUnit( Event )
+--function SCORING:OnEventPlayerEnterUnit( Event )
+--  if Event.IniUnit then
+--    self:_AddPlayerFromUnit( Event.IniUnit )
+--    self:SetScoringMenu( Event.IniGroup )
+--  end
+--end
+
+--- Handles the OnBirth event for the scoring.
+-- @param #SCORING self
+-- @param Core.Event#EVENTDATA Event
+function SCORING:OnEventBirth( Event )
+  
   if Event.IniUnit then
-    self:_AddPlayerFromUnit( Event.IniUnit )
-    self:SetScoringMenu( Event.IniGroup )
+    if Event.IniObjectCategory == 1 then
+      local PlayerName = Event.IniUnit:GetPlayerName()
+      if PlayerName ~= "" then
+        self:_AddPlayerFromUnit( Event.IniUnit )
+        self:SetScoringMenu( Event.IniGroup )
+      end
+    end
   end
 end