diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 82e682a85a899649879d3a8fd874fbb3b68a1e7e..9a80852dbdc0abb04dda03e1142bf5da78ffe294 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -500,18 +500,28 @@ window.isClothingAccessible = (function() {
 						}
 					}
 					case "choose own chastity": {
-						if (slave.choosesOwnChastity !== 1) {
-							return true;
-						} else {
-							return false;
+						if (V.arcologies[0].FSRestart !== "unset" && slave.devotion > 20 && slave.trust > 0) {
+							if (slave.choosesOwnChastity !== 1) {
+								if (slave.choosesOwnClothes === 1) {
+									return "Slave is not choosing own clothing";
+								} else {
+									return true;
+								}
+							}
 						}
+						return false;
 					}
 					case "revoke choosing own chastity": {
-						if (slave.choosesOwnChastity > 0) {
-							return true;
-						} else {
-							return false;
+						if (V.arcologies[0].FSRestart !== "unset" && slave.devotion > 20 && slave.trust > 0) {
+							if (slave.choosesOwnChastity > 0) {
+								if (slave.choosesOwnClothes === 1) {
+									return "Slave is not choosing own clothing";
+								} else {
+									return true;
+								}
+							}
 						}
+						return false;
 					}
 					default:
 						return true;
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 2635df971c1bc35091177828cd24a4ccb5edbcae..5ee25d6a021d1132bb869602cdb59ea4f9601498 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -239,23 +239,11 @@
 	<span id="chastity"></span>
 	<script>App.UI.Wardrobe.chastity(V.activeSlave)</script>
 
-
-	<<if $arcologies[0].FSRestart != "unset" && $activeSlave.devotion > 20 && $activeSlave.trust > 0 && $activeSlave.choosesOwnClothes == 1>>
-		<br>
-		<<if $activeSlave.choosesOwnChastity == 1>>
-			$He is allowed to decide whether $he to wear chastity devices.
-			[[Withdraw Privilege|Slave Interact][$activeSlave.choosesOwnChastity = 0]]
-		<<else>>
-			$He is not allowed to choose whether to wear chastity devices.
-			[[Allow Choice|Slave Interact][$activeSlave.choosesOwnChastity = 1]]
-		<</if>>
-	<</if>>
-
 <</if>> /* CLOSES FUCKDOLL CHECK */
 
 <</if>>	/* CLOSES WARDROBE CHECK */
 
-<br><br>__Physical Regimen:__
+<br>__Physical Regimen:__
 <span id="drugs"></span>
 <script>App.UI.SlaveInteract.drugs(V.activeSlave)</script>