diff --git a/libs/libpredict.lua b/libs/libpredict.lua
index c2fbc15a..f908b9cd 100644
--- a/libs/libpredict.lua
+++ b/libs/libpredict.lua
@@ -320,7 +320,9 @@ hooksecurefunc("CastSpellByName", function(effect, target)
   if not libpredict.sender.enabled then return end
   local effect, rank = libspell.GetSpellInfo(effect)
   if not effect then return end
-  local mouseover = pfUI and pfUI.uf and pfUI.uf.mouseover.name
+  local mouseover = pfUI and pfUI.uf and pfUI.uf.mouseover.unit
+  mouseover = mouseover and UnitCanAssist("player", mouseover) and UnitName(mouseover)
+
   local default = UnitName("target") and UnitCanAssist("player", "target") and UnitName("target") or UnitName("player")
 
   spell_queue[1] = effect
diff --git a/modules/mouseover.lua b/modules/mouseover.lua
index e6cc7c1b..918a3976 100644
--- a/modules/mouseover.lua
+++ b/modules/mouseover.lua
@@ -70,7 +70,7 @@ pfUI:RegisterModule("mouseover", "vanilla", function ()
       func()
     else
       -- write temporary unit name
-      pfUI.uf.mouseover.name = UnitName(unit)
+      pfUI.uf.mouseover.unit = unit
 
       -- cast without self cast cvar setting
       -- to allow spells to use spelltarget
@@ -83,7 +83,7 @@ pfUI:RegisterModule("mouseover", "vanilla", function ()
       if SpellIsTargeting() then SpellStopTargeting() end
 
       -- remove temporary mouseover unit
-      pfUI.uf.mouseover.name = nil
+      pfUI.uf.mouseover.unit = nil
     end
 
     if restore_target then