diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04f47c21ae..623cd07c6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,8 @@
   that are calculated on the fly.
 - `@py` command now defaults to escaping html tags in its output when viewing in the webclient.
   Use new `/clientraw` switch to get old behavior (issue #1369).
-- Shorter and more informative, dynamic, listing of on-command vars if not setting func() in child command class.
+- Shorter and more informative, dynamic, listing of on-command vars if not
+  setting func() in child command class.
 - New Command helper methods
   - `.client_width()` returns client width of the session running the command.
   - `.styled_table(*args, **kwargs)` returns a formatted evtable styled by user's options
@@ -130,9 +131,10 @@
 
 ### Server
 
-- Convert ServerConf model to store its values as a Picklefield (same as Attributes) instead of using a custom solution.
+- Convert ServerConf model to store its values as a Picklefield (same as
+    Attributes) instead of using a custom solution.
 - OOB: Add support for MSDP LIST, REPORT, UNREPORT commands (re-mapped to `msdp_list`,
-  `msdp_report`, `msdp_unreport` inlinefuncs_)
+  `msdp_report`, `msdp_unreport`, inlinefuncs)
 - Added `evennia.ANSIString` to flat API.
 - Server/Portal log files now cycle to names on the form `server_.log_19_03_08_` instead of `server.log___19.3.8`, retaining
   unix file sorting order.
diff --git a/evennia/server/game_index_client/client.py b/evennia/server/game_index_client/client.py
index b87712b9fe..b441355fa0 100644
--- a/evennia/server/game_index_client/client.py
+++ b/evennia/server/game_index_client/client.py
@@ -89,7 +89,7 @@ class EvenniaGameIndexClient(object):
         try:
             values = {
                 # Game listing stuff
-                'game_name': settings.SERVERNAME,
+                'game_name': egi_config.get('game_name', settings.SERVERNAME),
                 'game_status': egi_config['game_status'],
                 'game_website': egi_config.get('game_website', ''),
                 'short_description': egi_config['short_description'],