diff --git a/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs b/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs
index 421b1ef496..869c279993 100644
--- a/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs
+++ b/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs
@@ -3,7 +3,7 @@
     <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
         <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
             {{#if IsOrganization}}
-            This email is to notify you that your Bitwarden organization license has expired and must be updated for continued use. See the following article for details about replacing your license file:
+            This email is to notify you that your Bitwarden organization license for <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">{{OrganizationName}}</b> has expired and must be updated for continued use. See the following article for details about replacing your license file:
             {{else}}
             This email is to notify you that your Bitwarden premium license has expired and must be updated for continued use. See the following article for details about replacing your license file:
             {{/if}}
diff --git a/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs b/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs
index f8f11704e1..829e16f55c 100644
--- a/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs
+++ b/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs
@@ -1,9 +1,7 @@
 {{#>BasicTextLayout}}
 {{#if IsOrganization}}
-
-This email is to notify you that your Bitwarden organization license has expired and must be updated for continued use. See the following article for details about replacing your license file:
+This email is to notify you that your Bitwarden organization license for {{OrganizationName}} has expired and must be updated for continued use. See the following article for details about replacing your license file:
 {{else}}
-
 This email is to notify you that your Bitwarden premium license has expired and must be updated for continued use. See the following article for details about replacing your license file:
 {{/if}}
 
diff --git a/src/Core/Models/Mail/LicenseExpiredViewModel.cs b/src/Core/Models/Mail/LicenseExpiredViewModel.cs
index 1c9be0a103..70f5f32cd2 100644
--- a/src/Core/Models/Mail/LicenseExpiredViewModel.cs
+++ b/src/Core/Models/Mail/LicenseExpiredViewModel.cs
@@ -2,6 +2,7 @@
 {
     public class LicenseExpiredViewModel : BaseMailModel
     {
-        public bool IsOrganization { get; set; }
+        public string OrganizationName { get; set; }
+        public bool IsOrganization => !string.IsNullOrWhiteSpace(OrganizationName);
     }
 }
diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs
index 647f458235..d4c84b39f3 100644
--- a/src/Core/Services/IMailService.cs
+++ b/src/Core/Services/IMailService.cs
@@ -25,7 +25,7 @@ namespace Bit.Core.Services
             bool mentionInvoices);
         Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices);
         Task SendAddedCreditAsync(string email, decimal amount);
-        Task SendLicenseExpiredAsync(IEnumerable<string> emails, bool isOrganization);
+        Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null);
         Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip);
         Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string ip);
     }
diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs
index 99f764fe16..da5ab933a0 100644
--- a/src/Core/Services/Implementations/HandlebarsMailService.cs
+++ b/src/Core/Services/Implementations/HandlebarsMailService.cs
@@ -279,12 +279,12 @@ namespace Bit.Core.Services
             await _mailDeliveryService.SendEmailAsync(message);
         }
         
-        public async Task SendLicenseExpiredAsync(IEnumerable<string> emails, bool isOrganization)
+        public async Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null)
         {
             var message = CreateDefaultMessage("License Expired", emails);
             var model = new LicenseExpiredViewModel
             {
-                IsOrganization = isOrganization
+                OrganizationName = organizationName,
             };
             await AddMessageContentAsync(message, "LicenseExpired", model);
             message.Category = "LicenseExpired";
diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs
index 400bca44ee..f663989e63 100644
--- a/src/Core/Services/Implementations/LicensingService.cs
+++ b/src/Core/Services/Implementations/LicensingService.cs
@@ -128,7 +128,7 @@ namespace Bit.Core.Services
             org.RevisionDate = DateTime.UtcNow;
             await _organizationRepository.ReplaceAsync(org);
 
-            await _mailService.SendLicenseExpiredAsync(new List<string> { org.BillingEmail }, true);
+            await _mailService.SendLicenseExpiredAsync(new List<string> { org.BillingEmail }, org.Name);
         }
 
         public async Task ValidateUsersAsync()
@@ -219,7 +219,7 @@ namespace Bit.Core.Services
             user.RevisionDate = DateTime.UtcNow;
             await _userRepository.ReplaceAsync(user);
 
-            await _mailService.SendLicenseExpiredAsync(new List<string> { user.Email }, false);
+            await _mailService.SendLicenseExpiredAsync(new List<string> { user.Email });
         }
 
         public bool VerifyLicense(ILicense license)
diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs
index 5a169b31e8..0ccf7740bf 100644
--- a/src/Core/Services/NoopImplementations/NoopMailService.cs
+++ b/src/Core/Services/NoopImplementations/NoopMailService.cs
@@ -88,7 +88,7 @@ namespace Bit.Core.Services
             return Task.FromResult(0);
         }
 
-        public Task SendLicenseExpiredAsync(IEnumerable<string> emails, bool isOrganization)
+        public Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null)
         {
             return Task.FromResult(0);
         }