diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 66d746b30e..08ed0cc18e 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -120,7 +120,7 @@ var/list/nonhuman_positions = list(
 
 /proc/GetRank(var/job)
 	switch(job)
-		if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor", "Chaplain")
+		if("Bartender","Chef","Lawyer","Librarian","Janitor","Assistant","Unassigned", "Counselor")
 			return 0
 		if("Chaplain","Botanist","Hydroponicist","Medical Doctor","Atmospheric Technician","Geneticist", "Virologist", "Surgeon", "Emergency Medical Technician")
 			return 1
diff --git a/code/game/topic.dm b/code/game/topic.dm
index 8d82f1d600..70aa5cb2ea 100644
--- a/code/game/topic.dm
+++ b/code/game/topic.dm
@@ -1,20 +1,7 @@
 /world/Topic(T, addr, master, key)
 	diary << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]"
 
-	if (T == "ping")
-		var/x = 1
-		for (var/client/C)
-			x++
-		return x
-
-	else if(T == "players")
-		var/n = 0
-		for(var/mob/M in world)
-			if(M.client)
-				n++
-		return n
-
-	else if (T == "status")
+	if (T == "status")
 		var/list/s = list()
 		s["version"] = game_version
 		s["mode"] = master_mode
@@ -24,11 +11,16 @@
 		s["ai"] = config.allow_ai
 		s["host"] = host ? host : null
 		s["players"] = list()
+		s["admins"] = 0
 		var/n = 0
-		for(var/mob/M in world)
-			if(M.client)
-				s["player[n]"] = M.client.key
-				n++
+		for(var/client/C)
+			n++
+			if(C.holder && C.holder.level >= 0) //not retired admin
+				if(!C.stealth) //stealthmins dont count as admins
+					s["admins"] = 1
+					s["player[n]"] = "[C.key]"
+				else
+					s["player[n]"] = "[C.fakekey]"
 		s["players"] = n
 		s["end"] = "#end"
 		return list2params(s)
\ No newline at end of file