diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index e4268c16cd5..1042d9a8ddd 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -35,12 +35,18 @@
 		var/rank = t.fields["rank"]
 		var/real_rank = t.fields["real_rank"]
 		if(OOC)
-			var/active = 0
-			for(var/mob/M in GLOB.player_list)
-				if(M.real_name == name && M.client && M.client.inactivity <= 10 * 60 * 10)
-					active = 1
+			var/activetext = "Inactive"
+			for(var/thing in GLOB.human_list)
+				var/mob/living/carbon/human/H = thing
+				if(H.real_name != name)
+					continue
+				if(H.client && H.client.inactivity <= 6000)
+					activetext = "Active"
 					break
-			isactive[name] = active ? "Active" : "Inactive"
+				if(isLivingSSD(H))
+					activetext = "SSD"
+					break
+			isactive[name] = activetext
 		else
 			isactive[name] = t.fields["p_stat"]
 		var/department = 0
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index ef5268fa104..2d9966669e8 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -576,7 +576,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	var/dat
 	dat += "<h4>Crew Manifest</h4>"
-	dat += GLOB.data_core.get_manifest()
+	dat += GLOB.data_core.get_manifest(OOC = TRUE)
 
 	src << browse(dat, "window=manifest;size=370x420;can_close=1")