diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 767a9d62484..7da4cb363ad 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -502,8 +502,11 @@ GLOBAL_LIST_INIT(view_logs_verbs, list(
 		to_chat(src, "<span class='warning'>You can't observe a ghost.</span>")
 		return
 
-	if(cleanup_admin_observe(mob))
+	var/mob/dead/observer/observer = mob
+	if(istype(observer) && target == locateUID(observer.mob_observed))
+		cleanup_admin_observe(mob)
 		return
+	cleanup_admin_observe(mob)
 
 	if(isnull(target) || target == src)
 		// let the default one find the target if there isn't one
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index ec62088745b..9f2f38f4178 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1017,6 +1017,9 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
 		return FALSE
 	. = ..()
 
+/mob/dead/canface()
+	return TRUE
+
 /mob/proc/fall()
 	drop_l_hand()
 	drop_r_hand()