diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 93f91ad3a0..a1253acffb 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -234,7 +234,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 	var/list/choices = list()
 	for(var/client/C in GLOB.clients)
 		if(isobserver(C.mob) && see_ghost_names)
-			choices["[C.mob]([C])"] = C
+			choices["[C]"] = C //NONMODULARITY NOTE: Removes the ability to link CKEYs to Characters. Always reapply for privacy reasons.
 		else
 			choices[C] = C
 	choices = sortList(choices)
diff --git a/modular_splurt/code/datums/genitals/genitals_interface.dm b/modular_splurt/code/datums/genitals/genitals_interface.dm
index ef142eb47f..be6faefbe1 100644
--- a/modular_splurt/code/datums/genitals/genitals_interface.dm
+++ b/modular_splurt/code/datums/genitals/genitals_interface.dm
@@ -44,7 +44,8 @@
 	var/list/genitals = list()
 	for(var/obj/item/organ/genital/genital in genital_holder.internal_organs)	//Only get the genitals
 		if(CHECK_BITFIELD(genital.genital_flags, GENITAL_INTERNAL))			//Not those though
-			continue
+			if(genital.is_exposed()) //No siree. No more using this to OOCly metagame character genitals.
+				continue
 
 		var/list/genital_entry = list()
 		genital_entry["img"] = icon2base64(getFlatIcon(genital, no_anim=TRUE))