diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 79358118c..959dc5503 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -3434,8 +3434,8 @@ void Aura::HandleModStealth(bool apply, bool Real)
                 m_target->SetVisibility(VISIBILITY_GROUP_STEALTH);
             }
 
-            // for RACE_NIGHTELF stealth
-            if(m_target->GetTypeId()==TYPEID_PLAYER && GetId()==20580)
+            // (RACE_NIGHTELF stealth apply also Elusiveness)
+            if(m_target->getRace() == RACE_NIGHTELF)
                 m_target->CastSpell(m_target, 21009, true, NULL, this);
         }
     }
@@ -3444,8 +3444,8 @@ void Aura::HandleModStealth(bool apply, bool Real)
         // only at real aura remove
         if(Real)
         {
-            // for RACE_NIGHTELF stealth
-            if(m_target->GetTypeId()==TYPEID_PLAYER && GetId()==20580)
+            // (RACE_NIGHTELF stealth remove Elusiveness)
+            if(m_target->getRace() == RACE_NIGHTELF)
                 m_target->RemoveAurasDueToSpell(21009);
 
             // if last SPELL_AURA_MOD_STEALTH and no GM invisibility