diff --git a/Server/Services/BrowserSocketHub.cs b/Server/Services/BrowserSocketHub.cs
index 6c7a6a02..ee9b53a0 100644
--- a/Server/Services/BrowserSocketHub.cs
+++ b/Server/Services/BrowserSocketHub.cs
@@ -82,7 +82,7 @@ namespace Remotely.Server.Services
                 SenderConnectionID = Context.ConnectionId,
                 SenderUserID = Context.UserIdentifier,
                 TargetDeviceIDs = connections.Select(x => x.Value.ID).ToArray(),
-                OrganizationID = RemotelyUser.Organization.ID
+                OrganizationID = RemotelyUser.OrganizationID
             };
             DataService.AddOrUpdateCommandContext(commandContext);
             await Clients.Caller.SendAsync("CommandContextCreated", commandContext);
diff --git a/Server/wwwroot/Downloads/Install-Linux-x64.sh b/Server/wwwroot/Downloads/Install-Linux-x64.sh
index bde78043..3e979390 100644
--- a/Server/wwwroot/Downloads/Install-Linux-x64.sh
+++ b/Server/wwwroot/Downloads/Install-Linux-x64.sh
@@ -53,6 +53,7 @@ Description=The Remotely agent used for remote access.
 WorkingDirectory=/usr/local/bin/Remotely/
 ExecStart=/usr/local/bin/Remotely/Remotely_Agent
 Restart=always
+StartLimitIntervalSec=0
 RestartSec=10"
 
 [Install]