diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb
index 7a828d02695..5d90aa02ab8 100644
--- a/app/mailers/invite_mailer.rb
+++ b/app/mailers/invite_mailer.rb
@@ -9,7 +9,7 @@ class InviteMailer < ActionMailer::Base
 
     # get invitee name (based on site setting)
     invitee_name = invite.invited_by.username
-    if (SiteSetting.enable_names)
+    if SiteSetting.enable_names && invite.invited_by.name.present?
       invitee_name = "#{invite.invited_by.name} (#{invite.invited_by.username})"
     end