diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index 713c1e75..00c44a8f 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -848,6 +848,8 @@ namespace Remotely.Server.Services
                 .ThenInclude(x => x.Devices)
                 .Include(x => x.Organization)
                 .Include(x => x.Alerts)
+                .Include(x => x.SavedScripts)
+                .Include(x => x.ScriptSchedules)
                 .FirstOrDefault(x =>
                     x.Id == targetUserID &&
                     x.OrganizationID == orgID);