diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 7580b76fff..39c2587fe4 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -41,6 +41,13 @@
 
 			if(is_special_character(C.mob))
 				entry += " - <b><font color='red'>Antagonist</font></b>"
+
+			if(C.is_afk())
+				var/seconds = C.last_activity_seconds()
+				entry += " (AFK - "
+				entry += "[round(seconds / 60)] minutes, "
+				entry += "[seconds % 60] seconds)"
+
 			entry += " (<A HREF='?_src_=holder;adminmoreinfo=\ref[C.mob]'>?</A>)"
 			Lines += entry
 	else