diff --git a/Server/Pages/GetSupport.cshtml.cs b/Server/Pages/GetSupport.cshtml.cs
index 0e642b51..ed995857 100644
--- a/Server/Pages/GetSupport.cshtml.cs
+++ b/Server/Pages/GetSupport.cshtml.cs
@@ -48,7 +48,7 @@ namespace Remotely.Server.Pages
             var alertMessage = string.Join("  ", alertParts);
             await _dataService.AddAlert(deviceID, orgID, alertMessage);
 
-            var orgUsers = _dataService.GetAllUsersInOrganization(orgID);
+            var orgUsers = await _dataService.GetAllUsersInOrganization(orgID);
             var emailMessage = string.Join("<br />", alertParts);
             foreach (var user in orgUsers)
             {
diff --git a/Server/Pages/ManageOrganization.razor.cs b/Server/Pages/ManageOrganization.razor.cs
index 173ba479..02d643b8 100644
--- a/Server/Pages/ManageOrganization.razor.cs
+++ b/Server/Pages/ManageOrganization.razor.cs
@@ -227,7 +227,8 @@ namespace Remotely.Server.Pages
 
             _invites.AddRange(DataService.GetAllInviteLinks(Username).OrderBy(x => x.InvitedUser));
             _deviceGroups.AddRange(DataService.GetDeviceGroups(Username).OrderBy(x => x.Name));
-            _orgUsers.AddRange(DataService.GetAllUsersInOrganization(Username).OrderBy(x => x.UserName));
+            var orgUsers = await DataService.GetAllUsersInOrganization(User.OrganizationID);
+            _orgUsers.AddRange(orgUsers.OrderBy(x => x.UserName));
         }
         private async Task ResetPassword(RemotelyUser user)
         {
diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index 66a57c2e..dfbe274d 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -106,7 +106,7 @@ namespace Remotely.Server.Services
 
         RemotelyUser[] GetAllUsersForServer();
 
-        RemotelyUser[] GetAllUsersInOrganization(string userName);
+        Task<RemotelyUser[]> GetAllUsersInOrganization(string orgId);
 
         ApiToken GetApiKey(string keyId);
 
@@ -1093,17 +1093,20 @@ namespace Remotely.Server.Services
             return dbContext.Users.ToArray();
         }
 
-        public RemotelyUser[] GetAllUsersInOrganization(string userName)
+        public async Task<RemotelyUser[]> GetAllUsersInOrganization(string orgId)
         {
-            if (string.IsNullOrWhiteSpace(userName))
+            if (string.IsNullOrWhiteSpace(orgId))
             {
                 return Array.Empty<RemotelyUser>();
             }
 
             using var dbContext = _dbFactory.CreateDbContext();
 
-            var user = dbContext.Users.FirstOrDefault(x => x.UserName == userName);
-            return dbContext.Users.Where(x => x.OrganizationID == user.OrganizationID).ToArray();
+            var organization = await dbContext.Organizations
+                .Include(x => x.RemotelyUsers)
+                .FirstOrDefaultAsync(x => x.ID == orgId);
+
+            return organization.RemotelyUsers.ToArray();
         }
 
         public ApiToken GetApiKey(string keyId)