diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h
index f25e161c8..dc61685e2 100644
--- a/src/game/CreatureEventAI.h
+++ b/src/game/CreatureEventAI.h
@@ -117,7 +117,7 @@ enum EventAI_ActionType
     ACTION_T_CHANCED_TEXT               = 44,               // Chance to display the text, TextId1, optionally TextId2. If more than just -TextId1 is defined, randomize. Negative values.
     ACTION_T_THROW_AI_EVENT             = 45,               // EventType, Radius, unused 
     ACTION_T_SET_THROW_MASK             = 46,               // EventTypeMask, unused, unused
-    ACTION_T_EMOTE_TARGET               = 47,               // Emote, EmoteTarget, EntryOrGuid
+    ACTION_T_EMOTE_TARGET               = 47,               // EmoteId, TargetGuid
     ACTION_T_END,
 };
 
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index a0327fb5a..238f5022c 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -8429,7 +8429,7 @@ void Aura::PeriodicDummyTick()
                     return;
 
                 // Search SPELL_AURA_MOD_POWER_REGEN aura for this spell and add bonus
-                if (Aura* aura = GetHolder()->GetAuraByEffectIndex(SpellEffectIndex(GetEffIndex(EFFECT_INDEX_0))))
+                if (Aura* aura = GetHolder()->GetAuraByEffectIndex(SpellEffectIndex(GetEffIndex()-1)))
                 {
                     aura->GetModifier()->m_amount = m_modifier.m_amount;
                     ((Player*)target)->UpdateManaRegen();
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 824c392c9..b67d455c8 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 "12720"
+ #define REVISION_NR "12721"
 #endif // __REVISION_NR_H__