diff --git a/src/events/intro/pcAppearance.js b/src/events/intro/pcAppearance.js
index 7d01a20892ee0b6e6fb7623edf644ccfc94ec779..a603b2f45f37810a2ca03fb8ed1ca134618d982a 100644
--- a/src/events/intro/pcAppearance.js
+++ b/src/events/intro/pcAppearance.js
@@ -48,14 +48,21 @@ App.UI.Player.names = function(options) {
 	options.addOption(`Everyone calls you <b>${PlayerName()}.</b>`);
 	options.addOption("Your given name is", "slaveName", V.PC).showTextBox();
 
-	if (V.PC.slaveSurname === 0) {
-		options.addOption("And no surname", "slaveSurname", V.PC)
-			.addValue("Add a surname", "Anon")
-			.addComment("Surnames cannot be changed during the game outside of special circumstances.");
+	if (V.cheatMode) {
+		options.addOption("Name", "slaveName", V.PC).showTextBox();
+		options.addOption("Birth Name", "birthName", V.PC).showTextBox();
+		options.addOption("Surname", "slaveSurname", V.PC).showTextBox();
+		options.addOption("Birth Surname", "birthSurname", V.PC).showTextBox();
 	} else {
-		options.addOption("And your surname is", "slaveSurname", V.PC).showTextBox()
-			.addValue("Go by a single name", 0)
-			.addComment("Surnames cannot be changed during the game outside of special circumstances.");
+		if (V.PC.slaveSurname === 0) {
+			options.addOption("And no surname", "slaveSurname", V.PC)
+				.addValue("Add a surname", "Anon")
+				.addComment("Surnames cannot be changed during the game outside of special circumstances.");
+		} else {
+			options.addOption("And your surname is", "slaveSurname", V.PC).showTextBox()
+				.addValue("Go by a single name", 0)
+				.addComment("Surnames cannot be changed during the game outside of special circumstances.");
+		}
 	}
 };