diff --git a/Source/Framework/Constants/Spells/SpellAuraConst.cs b/Source/Framework/Constants/Spells/SpellAuraConst.cs
index 34056b37a..84ab8d920 100644
--- a/Source/Framework/Constants/Spells/SpellAuraConst.cs
+++ b/Source/Framework/Constants/Spells/SpellAuraConst.cs
@@ -355,7 +355,7 @@ namespace Framework.Constants
         ForceWeather = 331,
         OverrideActionbarSpells = 332,
         OverrideActionbarSpellsTriggered = 333, // Spells cast with this override have no cast time or power cost
-        AutoAttackCritChance = 334,
+        ModAutoAttackCritChance = 334,
         Unk335 = 335,
         MountRestrictions = 336,
         ModVendorItemsPrices = 337,
diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs
index c05938577..96ac747ad 100644
--- a/Source/Game/Entities/Unit/Unit.Combat.cs
+++ b/Source/Game/Entities/Unit/Unit.Combat.cs
@@ -2049,7 +2049,7 @@ namespace Game.Entities
             int miss_chance = (int)(MeleeSpellMissChance(victim, attType, 0) * 100.0f);
 
             // Critical hit chance
-            int crit_chance = (int)(GetUnitCriticalChance(attType, victim) * 100.0f);
+            int crit_chance = (int)(GetUnitCriticalChance(attType, victim) + GetTotalAuraModifier(AuraType.ModAutoAttackCritChance) * 100.0f);
 
             int dodge_chance = (int)(GetUnitDodgeChance(attType, victim) * 100.0f);
             int block_chance = (int)(GetUnitBlockChance(attType, victim) * 100.0f);
@@ -2292,7 +2292,7 @@ namespace Game.Entities
             float dz = GetPositionZMinusOffset() - obj.GetPositionZMinusOffset();
             float distsq = (dx * dx) + (dy * dy) + (dz * dz);
 
-            float maxdist = GetMeleeRange(obj);
+            float maxdist = GetMeleeRange(obj) + GetTotalAuraModifier(AuraType.ModAutoAttackRange);
 
             return distsq <= maxdist * maxdist;
         }