diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 3943b8800..1719b181a 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2904,8 +2904,10 @@ void Spell::cast(bool skipCheck)
         {
             // Shield Slam
             if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000020000000000)) && m_spellInfo->Category==1209)
+            {
                 if (m_caster->HasAura(58375))               // Glyph of Blocking
                     AddTriggeredSpell(58374);               // Glyph of Blocking
+            }
             break;
         }
         case SPELLFAMILY_PRIEST:
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 978337dd8..b51d563d5 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -8523,6 +8523,11 @@ void SpellAuraHolder::HandleSpellSpecificBoosts(bool apply)
         {
             switch(GetId())
             {
+                case 50720:                                 // Vigilance (warrior spell but not have warrior family)
+                {
+                    spellId1 = 68066;                       // Damage Reduction
+                    break;
+                }
                 case 57350:                                 // Illusionary Barrier
                 {
                     if (!apply && m_target->getPowerType() == POWER_MANA)
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 192fb607a..00e92e8b5 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1865,6 +1865,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                     if (spellInfo_1->SpellIconID == 3559 && spellInfo_2->SpellIconID == 3559)
                         return false;
 
+                    // Vigilance and Damage Reduction (Vigilance triggered spell)
+                    if (spellInfo_1->SpellIconID == 2834 && spellInfo_2->SpellIconID == 2834)
+                        return false;
+
                     break;
                 }
                 case SPELLFAMILY_MAGE:
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 6059bb019..b5ea992b6 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 "11025"
+ #define REVISION_NR "11026"
 #endif // __REVISION_NR_H__