diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 568cc899c..3f8fdc4ca 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -14192,7 +14192,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     //Need to call it to initialize m_team (m_team can be calculated from m_race)
     //Other way is to saves m_team into characters table.
     setFactionForRace(m_race);
-    SetCharm(0);
+    SetCharm(NULL);
 
     m_class = fields[5].GetUInt8();
 
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index b43667db5..9a67fa5d1 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -3090,7 +3090,7 @@ void Aura::HandleModPossess(bool apply, bool Real)
             m_target->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE,cinfo->faction_A);
         }
 
-        caster->SetCharm(0);
+        caster->SetCharm(NULL);
 
         if(caster->GetTypeId() == TYPEID_PLAYER)
         {
@@ -3246,7 +3246,7 @@ void Aura::HandleModCharm(bool apply, bool Real)
                 }
             }
 
-            caster->SetCharm(0);
+            caster->SetCharm(NULL);
 
             if(caster->GetTypeId() == TYPEID_PLAYER)
             {
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 39ca7531a..f151b6f33 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7372,7 +7372,7 @@ Unit* Unit::GetCharm() const
             return pet;
 
         sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid));
-        const_cast<Unit*>(this)->SetCharm(0);
+        const_cast<Unit*>(this)->SetCharm(NULL);
     }
 
     return NULL;
@@ -11436,4 +11436,4 @@ void Unit::NearTeleportTo( float x, float y, float z, float orientation, bool ca
         BuildHeartBeatMsg(&data);
         SendMessageToSet(&data, false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 7598cf648..7e055d6e1 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7525"
+ #define REVISION_NR "7526"
 #endif // __REVISION_NR_H__