diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js
index 7567a248fe8e0bf378e875e673bb34761204e9b9..3fd344776df342690bdc0b3604f81eb408bb44e7 100644
--- a/src/data/backwardsCompatibility/updateSlaveObject.js
+++ b/src/data/backwardsCompatibility/updateSlaveObject.js
@@ -927,29 +927,32 @@ App.Update.Slave = function(slave, genepool = false) {
 	}
 
 	if (slave.chastityAnus === undefined || slave.chastityPenis === undefined || slave.chastityVagina === undefined) {
+		// Fix dickAccessory
 		if (slave.dickAccessory === "combined chastity") {
 			slave.chastityAnus = 1;
 			slave.chastityPenis = 1;
 			slave.dickAccessory = "none";
-		} else if (slave.vaginalAccessory === "combined chastity") {
-			slave.chastityAnus = 1;
-			slave.chastityVagina = 1;
-			slave.vaginalAccessory = "none";
-		} else if (slave.dickAccessory === "anal chastity" || slave.vaginalAccessory === "anal chastity") {
-			slave.chastityAnus = 1;
-			slave.dickAccessory = "none";
-			slave.vaginalAccessory = "none";
 		} else if (slave.dickAccessory === "chastity") {
 			slave.chastityPenis = 1;
 			slave.dickAccessory = "none";
+		}
+		// Fix vaginalAccessory
+		if (slave.vaginalAccessory === "combined chastity") {
+			slave.chastityAnus = 1;
+			slave.chastityVagina = 1;
+			slave.vaginalAccessory = "none";
 		} else if (slave.vaginalAccessory === "chastity belt") {
 			slave.chastityVagina = 1;
 			slave.vaginalAccessory = "none";
-		} else {
-			slave.chastityAnus = 0;
-			slave.chastityPenis = 0;
-			slave.chastityVagina = 0;
 		}
+		if (slave.dickAccessory === "anal chastity" || slave.vaginalAccessory === "anal chastity") {
+			slave.chastityAnus = 1;
+			slave.dickAccessory = "none";
+			slave.vaginalAccessory = "none";
+		}
+		slave.chastityAnus = slave.chastityAnus || 0;
+		slave.chastityPenis = slave.chastityPenis || 0;
+		slave.chastityVagina = slave.chastityVagina || 0;
 	}
 
 	if (slave.rules !== undefined && slave.rules.rest === undefined) {