diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index 511046535..7da927765 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -19,4 +19,10 @@ class DeviseMailer < Devise::Mailer
     super(record, token, opts.merge(headers))
   end
   # rubocop:enable Style/OptionHash
+
+  def confirmation_instructions(record, token, opts = {})
+    @name = record.name
+    opts[:subject] = "#{@name}, confirm your #{Settings::Community.community_name} account"
+    super
+  end
 end
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index ba266f87d..985a800e3 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,7 +1,7 @@
 <% if @user.creator? %>
   <%= render partial: "creator_confirmation_instructions", locals: { url: confirmation_url(@resource, confirmation_token: @token) } %>
 <% else %>
-  <p>Welcome <%= @email %>!</p>
+  <p>Welcome <%= @name %>!</p>
 
   <p>You can confirm your account email through the link below:</p>