diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index b894a997d47..f7caa812336 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -48,12 +48,13 @@ var/religion_name = null
 		return station_name
 
 	if(events)
-		var/short_name = pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp")
-
-		station_name = new_station_name()
+		if (config && config.station_name)
+			station_name = config.station_name
+		else
+			station_name = new_station_name()
 
 		if (config && config.server_name)
-			world.name = "[config.server_name]: [short_name]"
+			world.name = "[config.server_name][config.server_name==station_name ? "" : ": [station_name]"]"
 		else
 			world.name = station_name
 
@@ -108,17 +109,6 @@ var/religion_name = null
 			new_station_name += pick("13","XIII","Thirteen")
 	return new_station_name
 
-/proc/world_name(var/name)
-
-	station_name = name
-
-	if (config && config.server_name)
-		world.name = "[config.server_name]: [name]"
-	else
-		world.name = name
-
-	return name
-
 var/syndicate_name = null
 /proc/syndicate_name()
 	if (syndicate_name)
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 2cde6a019a7..b74828c83f0 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -6,7 +6,8 @@
 #define EVERYONE_HAS_MAINT_ACCESS 4
 
 /datum/configuration
-	var/server_name = null				// server name (for world name / status)
+	var/server_name = null				// server name (the name of the game window)
+	var/station_name = null				// station name (the name of the station in-game)
 	var/server_suffix = 0				// generate numeric suffix based on server port
 	var/lobby_countdown = 120			// In between round countdown.
 
@@ -234,6 +235,8 @@
 					config.respawn = 0
 				if("servername")
 					config.server_name = value
+				if("stationname")
+					config.station_name = value
 				if("serversuffix")
 					config.server_suffix = 1
 				if("hostedby")
diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm
index 3f6af30ac58..3f8238177f0 100644
--- a/code/controllers/supply_shuttle.dm
+++ b/code/controllers/supply_shuttle.dm
@@ -354,7 +354,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
 
 		var/obj/item/weapon/paper/manifest/slip = new /obj/item/weapon/paper/manifest(A)
 
-		var printed_station_name = world.name // World name is available in the title bar, station_name can be different based on config.
+		var printed_station_name = station_name()
 		if(prob(5))
 			printed_station_name = new_station_name()
 			slip.erroneous |= MANIFEST_ERROR_NAME // They got our station name wrong.  BASTARDS!
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 74a7f004ed7..fcc318999e8 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -137,7 +137,7 @@ var/round_start_time = 0
 			//Deleting Startpoints but we need the ai point to AI-ize people later
 			if (S.name != "AI")
 				qdel(S)
-		world << "<FONT color='blue'><B>Enjoy the game!</B></FONT>"
+		world << "<FONT color='blue'><B>Welcome to [station_name()], enjoy your stay!</B></FONT>"
 		world << sound('sound/AI/welcome.ogg') // Skie
 		//Holiday Round-start stuff	~Carn
 		if(events.holiday)
diff --git a/config/config.txt b/config/config.txt
index d886eef1e80..a4e9469997f 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -1,6 +1,9 @@
-## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
+## Server name: This appears at the top of the screen in-game. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
 # SERVERNAME tgstation
 
+## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
+STATIONNAME Space Station 13
+
 # Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready.
 LOBBY_COUNTDOWN 120