diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm
index 9ab1d6924c3f7..59c26499ac1a2 100644
--- a/code/game/objects/items/charter.dm
+++ b/code/game/objects/items/charter.dm
@@ -14,11 +14,11 @@
 		user << "The crew has already settled into the shift. It probably wouldn't be good to rename the station right now."
 		return
 
-	var/new_name = reject_bad_name( input(user, "What do you want to name [station_name()]? Keep in mind particularly terrible names may attract the attention of your employers.")  as text|null )
+	var/new_name = input(user, "What do you want to name [station_name()]? Keep in mind particularly terrible names may attract the attention of your employers.")  as text|null
 	if(new_name)
 		world.name = new_name
+		station_name = new_name
 		minor_announce("[user.real_name] has designated your station as [world.name]", "Captain's Charter", 0)
 
 	else
-		user << "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>"
 		used = FALSE
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 70ca299624bd2..ce178888a7ed8 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -149,7 +149,8 @@
 		if("reset_name")
 			if(!check_rights(R_ADMIN))
 				return
-			world.name = "Space Station 13"
+			world.name = new_station_name()
+			station_name = world.name
 			log_admin("[key_name(usr)] reset the station name.")
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] reset the station name.</span>")