diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 107ae846026..47985688a46 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -898,21 +898,23 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/key_string
 	var/role_string
 	for(var/mob/living/carbon/human/H in living_mob_list)
-		if(!H.player_logged)
-			continue
-		if(!H.last_logout)
+		if(!isLivingSSD(H))
 			continue
 		mins_ssd = round((world.time - H.last_logout) / 600)
-		job_string = H.job
+		if(H.job)
+			job_string = H.job
+		else
+			job_string = "-"
 		key_string = H.key
 		if(job_string in command_positions)
 			job_string = "<U>" + job_string + "</U>"
-		role_string = ""
+		role_string = "-"
 		if(H.mind)
-			role_string = "[H.mind.special_role]"
+			if(H.mind.special_role)
+				role_string = "<U>[H.mind.special_role]</U>"
 			if(!H.key && H.mind.key)
 				key_string = H.mind.key
-		msg += "<TR><TD>[key_string]</TD><TD>[H.real_name]</TD><TD>[job_string]</TD><TD>[mins_ssd]</TD><TD><U>[role_string]</U></TD>"
+		msg += "<TR><TD>[key_string]</TD><TD>[H.real_name]</TD><TD>[job_string]</TD><TD>[mins_ssd]</TD><TD>[role_string]</TD>"
 		msg += "<TD>[get_area(H)]</TD><TD><A HREF='?_src_=holder;adminplayeropts=\ref[H]'>PP</A></TD>"
 		if(istype(H.loc, /obj/machinery/cryopod))
 			msg += "<TD>In Cryo</TD>"