diff --git a/server/kolide/invites.go b/server/kolide/invites.go
index d7d7656f8a..7aaac22277 100644
--- a/server/kolide/invites.go
+++ b/server/kolide/invites.go
@@ -76,6 +76,7 @@ type InviteMailer struct {
 	*Invite
 	KolideServerURL   template.URL
 	InvitedByUsername string
+	OrgName           string
 }
 
 func (i *InviteMailer) Message() ([]byte, error) {
diff --git a/server/service/service_invites.go b/server/service/service_invites.go
index eda85d4378..8312ff4a8b 100644
--- a/server/service/service_invites.go
+++ b/server/service/service_invites.go
@@ -54,6 +54,10 @@ func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePaylo
 		return nil, err
 	}
 
+	invitedBy := inviter.Name
+	if invitedBy == "" {
+		invitedBy = inviter.Username
+	}
 	inviteEmail := kolide.Email{
 		Subject: "You're Invited to Kolide",
 		To:      []string{invite.Email},
@@ -61,7 +65,8 @@ func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePaylo
 		Mailer: &kolide.InviteMailer{
 			Invite:            invite,
 			KolideServerURL:   template.URL(config.KolideServerURL),
-			InvitedByUsername: inviter.Name,
+			OrgName:           config.OrgName,
+			InvitedByUsername: invitedBy,
 		},
 	}