diff --git a/lib/system_message.rb b/lib/system_message.rb
index 29d52b520..9d10fcbce 100644
--- a/lib/system_message.rb
+++ b/lib/system_message.rb
@@ -14,29 +14,28 @@ class SystemMessage
   end
 
   def create(type, params = {})
-
-    defaults = {site_name: SiteSetting.title,
-                username: @recipient.username,
-                user_preferences_url: "#{Discourse.base_url}/users/#{@recipient.username_lower}/preferences",
-                new_user_tips: SiteContent.content_for(:usage_tips),
-                site_password: "",
-                base_url: Discourse.base_url}
-
     params = defaults.merge(params)
 
-
     title = I18n.t("system_messages.#{type}.subject_template", params)
-    raw_body = I18n.t("system_messages.#{type}.text_body_template", params)
+    raw = I18n.t("system_messages.#{type}.text_body_template", params)
 
     PostCreator.create(Discourse.site_contact_user,
-                       raw: raw_body,
                        title: title,
+                       raw: raw,
                        archetype: Archetype.private_message,
-                       subtype: TopicSubtype.system_message,
-                       target_usernames: @recipient.username)
+                       target_usernames: @recipient.username,
+                       subtype: TopicSubtype.system_message)
   end
 
-
-
+  def defaults
+    {
+      site_name: SiteSetting.title,
+      username: @recipient.username,
+      user_preferences_url: "#{Discourse.base_url}/users/#{@recipient.username_lower}/preferences",
+      new_user_tips: SiteContent.content_for(:usage_tips),
+      site_password: "",
+      base_url: Discourse.base_url,
+    }
+  end
 
 end