diff --git a/code/game/world.dm b/code/game/world.dm
index fcbcb6d3a1c..28a270b2543 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -194,8 +194,14 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
 	var/s = ""
 
 	if(GLOB.configuration.general.server_name)
-		s += "<b>[GLOB.configuration.general.server_name]</b> &#8212; "
-	s += "<b>[station_name()]</b> "
+		s += "<b>[GLOB.configuration.general.server_name]</b>] &#8212; "
+
+		s += "<b>[station_name()]</b>"
+	else // else so it neatly closes the byond hub initial square bracket even without a server name
+		s += "<b>[station_name()]</b>]"
+
+	if(GLOB.configuration.url.discord_url)
+		s += " (<a href=\"[GLOB.configuration.url.discord_url]\">Discord</a>)"
 
 	if(GLOB.configuration.general.server_tag_line)
 		s += "<br>[GLOB.configuration.general.server_tag_line]"
@@ -206,6 +212,9 @@ GLOBAL_LIST_EMPTY(world_topic_handlers)
 		s += "<br><b>STARTING</b>"
 
 	s += "<br>"
+
+	s += "\["
+
 	var/list/features = list()
 
 	if(!GLOB.enter_allowed)
diff --git a/config/example/config.toml b/config/example/config.toml
index 829cf4b9461..fa0d6b008f2 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -295,7 +295,7 @@ server_name = "ParaCode Test"
 # EG: The perfect mix of RP & action
 server_tag_line = "ParaCode Testing Server"
 # Server features. Shows in a newline
-server_features = "Medium RP, varied species/jobs."
+server_features = "Medium RP, varied species/jobs"
 # Allow OOC character metadata notes
 allow_character_metadata = true
 # Lobby time before roundstart (Seconds)