diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index a9cb528f2e..922d3a34ad 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -205,5 +205,9 @@
 		/obj/item/clothing/gloves/color/brown = 1)
 
 	var/obj/item/clothing/gloves/color/selected = pick(gloves)
-	new selected(loc)
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		H.equip_to_slot_or_del(new selected(H), slot_gloves)
+	else
+		new selected(loc)
 	return INITIALIZE_HINT_QDEL
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 4ccfd44b17..3a12f00a05 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -7,7 +7,11 @@
 /obj/item/clothing/under/color/random/Initialize()
 	..()
 	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
-	new C(loc)
+	if(ishuman(loc))
+		var/mob/living/carbon/human/H = loc
+		H.equip_to_slot_or_del(new C(H), slot_w_uniform) //or else you end up with naked assistants running around everywhere...
+	else
+		new C(loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/item/clothing/under/color/black