diff --git a/Source/Game/Server/WorldManager.cs b/Source/Game/Server/WorldManager.cs
index 12bc2be0d..c63acd85a 100644
--- a/Source/Game/Server/WorldManager.cs
+++ b/Source/Game/Server/WorldManager.cs
@@ -371,9 +371,6 @@ namespace Game
             Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo custom attributes...");
             Global.SpellMgr.LoadSpellInfoCustomAttributes();
 
-            Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo SpellSpecific and AuraState...");
-            Global.SpellMgr.LoadSpellInfoSpellSpecificAndAuraState();
-
             Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo diminishing infos...");
             Global.SpellMgr.LoadSpellInfoDiminishing();
 
@@ -439,6 +436,9 @@ namespace Game
             Log.outInfo(LogFilter.ServerLoading, "Loading Spell Learn Skills...");
             Global.SpellMgr.LoadSpellLearnSkills();
 
+            Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo SpellSpecific and AuraState...");
+            Global.SpellMgr.LoadSpellInfoSpellSpecificAndAuraState();
+
             Log.outInfo(LogFilter.ServerLoading, "Loading Spell Learn Spells...");
             Global.SpellMgr.LoadSpellLearnSpells();
 
diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs
index e8d99911c..e7e405b3d 100644
--- a/Source/Game/Spells/Spell.cs
+++ b/Source/Game/Spells/Spell.cs
@@ -4928,7 +4928,7 @@ namespace Game.Spells
                         }
                     case SpellEffectName.Charge:
                         {
-                            if (m_caster.HasUnitState(UnitState.Root))
+                            if (!_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IgnoreCasterAuras) && m_caster.HasUnitState(UnitState.Root))
                                 return SpellCastResult.Rooted;
 
                             if (GetSpellInfo().NeedsExplicitUnitTarget())
diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs
index fbf815d91..2c6961d46 100644
--- a/Source/Game/Spells/SpellInfo.cs
+++ b/Source/Game/Spells/SpellInfo.cs
@@ -1429,10 +1429,6 @@ namespace Game.Spells
                                 case 8091: // Armor
                                     _spellSpecific = SpellSpecificType.Scroll;
                                     break;
-                                case 12880: // Enrage (Enrage)
-                                case 57518: // Enrage (Wrecking Crew)
-                                    _spellSpecific = SpellSpecificType.WarriorEnrage;
-                                    break;
                             }
                         }
                         break;