diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index fd296ea1f..f01ae06f6 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -355,12 +355,14 @@ bool Creature::UpdateEntry(uint32 Entry, Team team, const CreatureData* data /*=
     SetAttackTime(RANGED_ATTACK, GetCreatureInfo()->rangeattacktime);
 
     uint32 unitFlags = GetCreatureInfo()->unit_flags;
+    uint32 unitFlags2 = GetCreatureInfo()->unit_flags2;
 
     // we may need to append or remove additional flags
     if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT))
         unitFlags |= UNIT_FLAG_IN_COMBAT;
 
     SetUInt32Value(UNIT_FIELD_FLAGS, unitFlags);
+    SetUInt32Value(UNIT_FIELD_FLAGS_2, unitFlags2);
 
     // preserve all current dynamic flags if exist
     uint32 dynFlags = GetUInt32Value(UNIT_DYNAMIC_FLAGS);
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 44692ca2c..8df301dd9 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -603,7 +603,7 @@ enum UnitFlags
     UNIT_FLAG_UNK_31                = 0x80000000            // set skinnable icon and also changes color of portrait
 };
 
-// Value masks for UNIT_FIELD_FLAGS_2
+// Value masks for UNIT_FIELD_FLAGS_2 (initialy is not implemented)
 enum UnitFlags2
 {
     UNIT_FLAG2_FEIGN_DEATH          = 0x00000001,
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index c8fad976a..5fd1b7679 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 "12767"
+ #define REVISION_NR "12768"
 #endif // __REVISION_NR_H__