diff --git a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/MerchantData.java b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/MerchantData.java
index 7f41c4f2cc28173582b8f11a087d0ab0fea9d5cc..e795fc2523cfdbc8d718f9113cbff3464a46ed23 100644
--- a/src/main/java/com/syncleus/aethermud/storage/graphdb/model/MerchantData.java
+++ b/src/main/java/com/syncleus/aethermud/storage/graphdb/model/MerchantData.java
@@ -76,11 +76,13 @@ public abstract class MerchantData extends AbstractInterceptingVertexFrame {
     @Property("roomIds")
     public abstract void setRoomIds(Set<Integer> roomIds);
 
-    @Property("welcomeMessage")
-    public abstract String getWelcomeMessage();
+    public String getWelcomeMessage() {
+        return ColorizedTextTemplate.renderFromTemplateLanguage(this.getProperty("welcomeMessage"));
+    }
 
-    @Property("welcomeMessage")
-    public abstract void setWelcomeMessage(String welcomeMessage);
+    public void setWelcomeMessage(String welcomeMessage) {
+        this.setProperty("welcomeMessage", ColorizedTextTemplate.renderToTemplateLanguage(welcomeMessage));
+    }
 
     @Adjacency(label = "merchantItemForSales", direction = Direction.OUT)
     public abstract <N extends MerchantItemForSaleData> Iterator<? extends N> getMerchantItemForSaleDataIterator(Class<? extends N> type);