diff --git a/src/npc/generate/heroCreator.js b/src/npc/generate/heroCreator.js
index 0da21a4a1f8171fac4ac74e3f9108496a26859d4..d22e0249ea99d13c532efdc5ca50bd69b4cf2e6c 100644
--- a/src/npc/generate/heroCreator.js
+++ b/src/npc/generate/heroCreator.js
@@ -87,6 +87,12 @@ App.Utils.getHeroSlave = function(heroSlave) {
 			setup.namePoolSelector[heroSlave.nationality] ||
 			setup.whiteAmericanSlaveNames).random();
 	}
+	if (heroSlave.slaveName === -1) {
+		heroSlave.slaveName = heroSlave.birthName;
+	}
+	if (heroSlave.slaveSurname === -1) {
+		heroSlave.slaveSurname = heroSlave.birthSurname;
+	}
 	generatePronouns(heroSlave);
 	if (heroSlave.geneMods === undefined) {
 		heroSlave.geneMods = {};
diff --git a/src/npc/generate/slaveGenerationJS.js b/src/npc/generate/slaveGenerationJS.js
index e1e6d496d4cd5499d2a40de7128c7a4d25efe330..f2eb6ec7f25d58e9f646bb2d1235df659fa499f8 100644
--- a/src/npc/generate/slaveGenerationJS.js
+++ b/src/npc/generate/slaveGenerationJS.js
@@ -1537,7 +1537,7 @@ globalThis.generatePronouns = function(slave) {
  * @param {App.Entity.SlaveState} slave
  */
 globalThis.generatePuberty = function(slave) {
-	if ((slave.ovaries === 1 || slave.mpreg === 1) && slave.physicalAge >= slave.pubertyAgeXX) {
+	if (((slave.ovaries === 1 || slave.mpreg === 1) && slave.physicalAge >= slave.pubertyAgeXX) || slave.pubertyXX === 1) {
 		slave.pubertyXX = 1;
 	} else {
 		if (slave.preg >= -1) {
@@ -1545,7 +1545,7 @@ globalThis.generatePuberty = function(slave) {
 		}
 		slave.pubertyXX = 0;
 	}
-	if (slave.balls > 0 && slave.ballType !== "sterile" && slave.physicalAge >= slave.pubertyAgeXY) {
+	if ((slave.balls > 0 && slave.ballType !== "sterile" && slave.physicalAge >= slave.pubertyAgeXY) || slave.pubertyXY === 1) {
 		slave.pubertyXY = 1;
 	} else {
 		slave.pubertyXY = 0;