diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 9627cd65b3..1cbdc09594 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1183,7 +1183,11 @@ datum/preferences
 				if("name")
 					var/raw_name = input(user, "Choose your character's name:", "Character Preference")  as text|null
 					if (!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
-						var/new_name = sanitizeName(raw_name)
+						var/new_name
+						if(species == "Machine")
+							new_name = sanitizeName(raw_name,,1)
+						else
+							new_name = sanitizeName(raw_name)
 						if(new_name)
 							real_name = new_name
 						else
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index a67efd084c..f1b7eb5e0d 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -188,7 +188,11 @@
 
 	//Sanitize
 	metadata		= sanitize_text(metadata, initial(metadata))
-	real_name		= sanitizeName(real_name)
+
+	if(species == "Machine")
+		real_name		= sanitizeName(real_name,,1)
+	else
+		real_name		= sanitizeName(real_name)
 
 	if(isnull(species) || !(species in playable_species))
 		species = "Human"