diff --git a/roles/terraria/templates/config b/roles/terraria/templates/config
index 4b2b919..8f52d87 100644
--- a/roles/terraria/templates/config
+++ b/roles/terraria/templates/config
@@ -4,10 +4,10 @@ maxplayers=8
 world={{ terraria_root }}/{{ terraria_name }}/worlds/world.wld
 port={{ terraria_port }}
 password={{ terraria_password }}
-motd={{ terraria_motd }}
+motd={{ terraria_worldname }}: {{ terraria_motd }}
 worldpath={{ terraria_root }}/{{ terraria_name }}/worlds
 autocreate={{ terraria_worldsize }}
 difficulty={{ terraria_difficulty }}
-worldname={{ terraria_worldname }}
+worldname=world.wld
 banlist=banlist.txt
 secure=1