diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 6d34d29b64..77fbf5e338 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -408,6 +408,13 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
         }
     }
 
+    if(!m_targets.getUnitTargetGUID() && m_spellInfo->Targets & TARGET_FLAG_UNIT)
+    {
+        if(Unit *target = ObjectAccessor::GetUnit(*m_caster, m_caster->GetUInt64Value(UNIT_FIELD_TARGET)))
+            if(IsValidSingleTargetSpell(target))
+                m_targets.setUnitTarget(target);
+    }
+
     CleanupTargetList();
 }
 
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 9bd7c31e95..83d978a720 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2250,6 +2250,14 @@ void SpellMgr::LoadSpellCustomAttr()
                         spellInfo->Effect[j] = SPELL_EFFECT_TRIGGER_MISSILE;
                     break;
             }
+
+            switch(SpellTargetType[spellInfo->EffectImplicitTargetA[j]])
+            {
+                case TARGET_TYPE_UNIT_TARGET:
+                case TARGET_TYPE_DEST_TARGET:
+                    spellInfo->Targets |= TARGET_FLAG_UNIT;
+                    break;
+            }
         }
 
         if(spellInfo->SpellVisual[0] == 3879)