diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm
index 024919880d..b0ba99016e 100644
--- a/code/modules/clothing/spacesuits/rig/modules/modules.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm
@@ -147,7 +147,7 @@
 		usr << "<span class='warning'>The suit is not initialized.</span>"
 		return 0
 
-	if(holder.security_check_enabled && !(istype(usr,/mob/living/silicon) || holder.allowed(usr)))
+	if(holder.security_check_enabled && !holder.check_suit_access(usr))
 		usr << "<span class='danger'>Access denied.</span>"
 		return
 
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 89273dd31a..5f32580ad6 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -278,7 +278,7 @@
 			module.deactivate()
 	for(var/obj/item/piece in list(helmet,boots,gloves,chest))
 		if(!piece) continue
-		if(canremove && (flags & AIRTIGHT))
+		if(canremove)
 			piece.flags &= ~STOPSPRESSUREDMAGE
 			piece.flags &= ~AIRTIGHT
 		else