diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 066ecee7605..15577a308b8 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -412,7 +412,8 @@ BLIND     // can't see anything
 	else
 		under_icon = INV_W_UNIFORM_DEF_ICON
 
-	if((worn_state + "_d_s") in icon_states(under_icon))
+	// The _s is because the icon update procs append it.
+	if(("[worn_state]_d_s") in icon_states(under_icon))
 		if(rolled_down != 1)
 			rolled_down = 0
 	else
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index a573a4d7bcc..729c204f8b3 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -63,6 +63,7 @@
 
 		var/obj/item/clothing/under/U = item
 		if(istype(U))
+			U.worn_state = U.icon_state
 			U.update_rolldown_status()
 
 	// Kits are dumb so this is going to have to be hardcoded/snowflake.