diff --git a/lib/jam_ruby/app/mailers/user_mailer.rb b/lib/jam_ruby/app/mailers/user_mailer.rb
index d63ce7d00..96b322def 100644
--- a/lib/jam_ruby/app/mailers/user_mailer.rb
+++ b/lib/jam_ruby/app/mailers/user_mailer.rb
@@ -25,7 +25,7 @@ module JamRuby
       sendgrid_category "Welcome"
       sendgrid_unique_args :type => "welcome_message"
 
-      mail(:to => user.email, :subject => "Welcome #{user.first_name} to Jamkazam") do |format|
+      mail(:to => user.email, :subject => "Welcome to Jamkazam, #{user.first_name} ") do |format|
         format.text
         format.html
        end
diff --git a/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb b/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb
index 922fb456a..06d6c928a 100644
--- a/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb
+++ b/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb
@@ -1,4 +1,4 @@
 <% provide(:title, 'Welcome to Jamkazam') %>
 
-<p>Welcome <%= @user.first_name %> to Jamkazam!</p>
+<p>Welcome to Jamkazam, <%= @user.first_name %> !</p>
 <p>To confirm this email address, please go to the <a href="<%= @signup_confirm_url %>">signup confirmation page.</a>.</p>
diff --git a/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb b/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb
index 7befb32f3..73ad001bd 100644
--- a/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb
+++ b/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.text.erb
@@ -1,3 +1,3 @@
-Welcome <%= @user.first_name %> to Jamkazam!
+Welcome to Jamkazam, <%= @user.first_name %>!
 
-To confirm this email address, please go to the signup confirmation page at: <%=  @signup_confirm_url %>.
\ No newline at end of file
+To confirm this email address, please go to the signup confirmation page at: <%= @signup_confirm_url %>.
\ No newline at end of file