From bf9f965325a5075de67e4f2337b59da04c193540 Mon Sep 17 00:00:00 2001
From: Alex Morask <amorask@bitwarden.com>
Date: Wed, 1 Nov 2023 09:53:58 -0400
Subject: [PATCH 1/2] Check null or whitespace on GatewayCustomerId and
 BillingEmail

---
 src/Admin/Controllers/OrganizationsController.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Admin/Controllers/OrganizationsController.cs b/src/Admin/Controllers/OrganizationsController.cs
index b3a232c2c8ba..f671df558d80 100644
--- a/src/Admin/Controllers/OrganizationsController.cs
+++ b/src/Admin/Controllers/OrganizationsController.cs
@@ -215,7 +215,10 @@ public async Task<IActionResult> Edit(Guid id, OrganizationEditModel model)
 
         try
         {
-            await _stripeSyncService.UpdateCustomerEmailAddress(organization.GatewayCustomerId, organization.BillingEmail);
+            if (!string.IsNullOrWhiteSpace(organization.GatewayCustomerId) && !string.IsNullOrWhiteSpace(organization.BillingEmail))
+            {
+                await _stripeSyncService.UpdateCustomerEmailAddress(organization.GatewayCustomerId, organization.BillingEmail);
+            }
         }
         catch (StripeException stripeException)
         {

From cf4a5d8c775bd6c96d7a756b0fc895cc4e5ba67b Mon Sep 17 00:00:00 2001
From: Alex Morask <amorask@bitwarden.com>
Date: Thu, 2 Nov 2023 09:51:19 -0400
Subject: [PATCH 2/2] Fixed expiration input

---
 src/Admin/Views/Shared/_OrganizationForm.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Admin/Views/Shared/_OrganizationForm.cshtml b/src/Admin/Views/Shared/_OrganizationForm.cshtml
index d0530849acbd..9e1b488b173c 100644
--- a/src/Admin/Views/Shared/_OrganizationForm.cshtml
+++ b/src/Admin/Views/Shared/_OrganizationForm.cshtml
@@ -259,7 +259,7 @@
             <div class="col-sm">
                 <div class="form-group">
                     <label asp-for="ExpirationDate"></label>
-                    <input type="datetime-local" class="form-control" asp-for="ExpirationDate" readonly='@(!canEditLicensing)'>
+                    <input type="datetime-local" class="form-control" asp-for="ExpirationDate" readonly='@(!canEditLicensing)' step="1">
                 </div>
             </div>
         </div>