diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm
index 2705f5ca906..8478b2bb46a 100644
--- a/code/datums/outfit.dm
+++ b/code/datums/outfit.dm
@@ -70,7 +70,7 @@
 		for(var/i=0,i<number,i++)
 			H.equip_to_slot_or_del(new path(H),slot_in_backpack)
 
-	H.update_body()
 	post_equip(H, visualsOnly)
 
+	H.update_body()
 	return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 7cde39dd846..0f76bbced9c 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -384,10 +384,13 @@
 		not_digitigrade = FALSE
 		if(!(DIGITIGRADE in specflags)) //Someone cut off a digitigrade leg and tacked it on
 			specflags += DIGITIGRADE
-		if(O.use_digitigrade == FULL_DIGITIGRADE && (H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) || (H.wear_suit.body_parts_covered & LEGS)) || (H.w_uniform && (H.w_uniform.body_parts_covered & LEGS))))
+		var/should_be_squished = FALSE
+		if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) || (H.wear_suit.body_parts_covered & LEGS)) || (H.w_uniform && (H.w_uniform.body_parts_covered & LEGS)))
+			should_be_squished = TRUE
+		if(O.use_digitigrade == FULL_DIGITIGRADE && should_be_squished)
 			O.use_digitigrade = SQUISHED_DIGITIGRADE
 			update_needed = TRUE
-		else if(O.use_digitigrade == SQUISHED_DIGITIGRADE)
+		else if(O.use_digitigrade == SQUISHED_DIGITIGRADE && !should_be_squished)
 			O.use_digitigrade = FULL_DIGITIGRADE
 			update_needed = TRUE
 	if(update_needed)