diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index ffe411981ed..c9a9faa92ee 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -44,6 +44,7 @@ Possible to do for anyone motivated enough:
if(!(stat & NOPOWER)&&user.eyeobj.loc==src.loc)//If the projector has power and client eye is on it.
if(!hologram)//If there is not already a hologram.
create_holo(user)//Create one.
+ user.current = src
for(var/mob/M in viewers())
M.show_message("A holographic image of [user] flicks to life right before your eyes!",1)
else
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 4eaddf543b9..b6df38e8ef1 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -48,14 +48,18 @@
if (!message)
return
- var/obj/machinery/hologram/holopad/T = client.eye//Client eye centers on an object.
- if(istype(T)&&T.hologram&&T.master==src)//If there is a hologram and its master is the user.
+ if(!isAI(src))
+ return
+
+ var/mob/living/silicon/ai/A = src
+ var/obj/machinery/hologram/holopad/T = A.current//Client eye centers on an object.
+ if(istype(T) && T.hologram && T.master==src)
var/message_a = say_quote(message)
//Human-like, sorta, heard by those who understand humans.
var/rendered_a = "[name] [message_a]"
- //Speach distorted, heard by those who do not understand AIs.
+ //Speech distorted, heard by those who do not understand AIs.
message = stars(message)
var/message_b = say_quote(message)
var/rendered_b = "[voice_name] [message_b]"