diff --git a/templates/newship.tmpl b/templates/newship.tmpl
index 3cc4fd9..5be056e 100644
--- a/templates/newship.tmpl
+++ b/templates/newship.tmpl
@@ -1,8 +1,6 @@
 Subject: Your new ship/colony/outpost is ready
 
-Hi ~username,
+~USERNAME,
 
-"shipname" has been created and placed in your control. We'll be
+"SHIPNAME" has been created and placed in your control. We'll be
 listening from Relay One to hear her stories.
-
-~tomasino