From 250509c7acea3c2b88627cf1a11b3fb290d4ef67 Mon Sep 17 00:00:00 2001
From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Date: Fri, 10 Mar 2023 09:52:07 -0600
Subject: [PATCH] Add fix for MSP's enabling secrets manager (#2794)

---
 src/Api/Controllers/OrganizationsController.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
index eb242a475f..92e9fcb876 100644
--- a/src/Api/Controllers/OrganizationsController.cs
+++ b/src/Api/Controllers/OrganizationsController.cs
@@ -703,8 +703,11 @@ public class OrganizationsController : Controller
         if (model.Enabled)
         {
             var orgUser = await _organizationUserRepository.GetByOrganizationAsync(id, userId);
-            orgUser.AccessSecretsManager = true;
-            await _organizationUserRepository.ReplaceAsync(orgUser);
+            if (orgUser != null)
+            {
+                orgUser.AccessSecretsManager = true;
+                await _organizationUserRepository.ReplaceAsync(orgUser);
+            }
         }
     }
 }