fixing up all scenarios.

Author: jrmccannon

src/Core/Models/Mail/OrganizationUserInvitedViewModel.cs

@@ -68,7 +68,7 @@ public static OrganizationUserInvitedViewModel CreateFromInviteInfo_v2(
                     ? string.Empty
                     : CoreHelpers.SanitizeForEmail(orgInvitesInfo.OrganizationName, false),
             TitleThird = orgInvitesInfo.IsFreeOrg ? string.Empty : " on Bitwarden and start securing your passwords!",
-            OrganizationName = CoreHelpers.SanitizeForEmail(orgInvitesInfo.OrganizationName, false) + orgUser.Status,
+            OrganizationName = CoreHelpers.SanitizeForEmail(orgInvitesInfo.OrganizationName, false),
             Email = WebUtility.UrlEncode(orgUser.Email),
             OrganizationId = orgUser.OrganizationId.ToString(),
             OrganizationUserId = orgUser.Id.ToString(),
@@ -83,7 +83,8 @@ public static OrganizationUserInvitedViewModel CreateFromInviteInfo_v2(
             OrgSsoEnabled = orgInvitesInfo.OrgSsoEnabled,
             OrgSsoLoginRequiredPolicyEnabled = orgInvitesInfo.OrgSsoLoginRequiredPolicyEnabled,
             OrgUserHasExistingUser = userHasExistingUser,
-            JoinOrganizationButtonText = userHasExistingUser ? "Accept invitation" : "Finish account setup"
+            JoinOrganizationButtonText = userHasExistingUser || orgInvitesInfo.IsFreeOrg ? "Accept invitation" : "Finish account setup",
+            IsFreeOrg = orgInvitesInfo.IsFreeOrg
         };
     }
 
@@ -100,6 +101,7 @@ public static OrganizationUserInvitedViewModel CreateFromInviteInfo_v2(
     public bool OrgSsoLoginRequiredPolicyEnabled { get; set; }
     public bool OrgUserHasExistingUser { get; set; }
     public string JoinOrganizationButtonText { get; set; } = "Join Organization";
+    public bool IsFreeOrg { get; set; }
 
     public string Url
     {

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -369,13 +369,19 @@ public async Task SendOrganizationInviteEmailsAsync(OrganizationInvitesInfo orgI
 
         MailQueueMessage CreateMessage(string email, OrganizationUserInvitedViewModel model)
         {
-            var subject = $"Join {orgInvitesInfo.OrganizationName}";
+            var subject = $"Join {model.OrganizationName}";
 
             if (orgInvitesInfo.IsSubjectFeatureEnabled)
             {
-                subject = model.OrgUserHasExistingUser
-                    ? $"{model.OrganizationName} invited you to their Bitwarden organization."
-                    : $"{model.OrganizationName} set up a Bitwarden account for you.";
+                ArgumentNullException.ThrowIfNull(model);
+
+                subject = model! switch
+                {
+                    { IsFreeOrg: true, OrgUserHasExistingUser: true } => "You have been invited to a Bitwarden Organization",
+                    { IsFreeOrg: true, OrgUserHasExistingUser: false } => "You have been invited to Bitwarden Password Manager",
+                    { IsFreeOrg: false, OrgUserHasExistingUser: true } => $"{model.OrganizationName} invited you to their Bitwarden organization",
+                    { IsFreeOrg: false, OrgUserHasExistingUser: false } => $"{model.OrganizationName} set up a Bitwarden account for you"
+                };
             }
 
             var message = CreateDefaultMessage(subject, email);