diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 83596fe2647..5bb32a0f39a 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -440,9 +440,6 @@
 
 	send_resources()
 
-	// Check code/modules/admin/verbs/antag-ooc.dm for definition
-	add_aooc_if_necessary()
-
 	check_ip_intel()
 
 	fetch_unacked_warning_count()
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index fadc87d715b..8b1a8a3fecb 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -86,3 +86,6 @@
 	MOB_STOP_THINKING(src)
 
 	update_client_color()
+
+	// Check code/modules/admin/verbs/antag-ooc.dm for definition
+	client.add_aooc_if_necessary()
diff --git a/html/changelogs/skull132_aooc-not-appearing.yml b/html/changelogs/skull132_aooc-not-appearing.yml
new file mode 100644
index 00000000000..ee227ce00cf
--- /dev/null
+++ b/html/changelogs/skull132_aooc-not-appearing.yml
@@ -0,0 +1,5 @@
+author: Skull132
+delete-after: True
+
+changes:
+  - bugfix: "AOOC should now properly be re-added to the client in all cases."