diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 0f59be6a2bf..a1b54af3944 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -468,7 +468,7 @@
 
 	spawn(0) //Name yourself on your own damn time
 		var/new_name = target.name
-		while(!new_name && target.client)
+		while(target.client)
 			if(!target) return
 			var/try_name = input(target,"Pick a name for your new form!", "New Name", target.name)
 			var/clean_name = sanitizeName(try_name, allow_numbers = TRUE)
@@ -477,6 +477,7 @@
 				if(okay == "Ok")
 					new_name = clean_name
 
+		new_name = sanitizeName(new_name, allow_numbers = TRUE)
 		target.name = new_name
 		target.real_name = target.name