diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index aac2893b049..9ac005c05e4 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -137,6 +137,9 @@
 	if(isAI(usr))
 		var/mob/living/silicon/ai/AI = usr
 		AI.sensor_mode()
+	else if(isrobot(usr))
+	 	var/mob/living/silicon/robot/borg = usr
+		borg.sensor_mode()
 
 
 /datum/hud/proc/ai_hud()
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index b0b7239685d..84fd44e8851 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -285,7 +285,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(data_hud_seen) //remove old huds
 		var/datum/atom_hud/H = huds[data_hud_seen]
 		H.remove_hud_from(src)
-	show_me_the_hud(DATA_HUD_SECURITY_BASIC)
+	show_me_the_hud(DATA_HUD_MEDICAL_BASIC)
 
 /mob/dead/observer/verb/toggle_antagHUD()
 	set category = "Ghost"