diff --git a/Server/wwwroot/Content/Install-Remotely.ps1 b/Server/wwwroot/Content/Install-Remotely.ps1
index 0a80e83e9..940fb5091 100644
--- a/Server/wwwroot/Content/Install-Remotely.ps1
+++ b/Server/wwwroot/Content/Install-Remotely.ps1
@@ -129,8 +129,9 @@ function Install-Remotely {
 	}
 
 	if (!$ConnectionInfo) {
+		$NewDeviceId = [System.Guid]::NewGuid().ToString();
 		$ConnectionInfo = @{
-			DeviceID                = (New-Guid).ToString();
+			DeviceID                = $NewDeviceId;
 			Host                    = $HostName;
 			OrganizationID          = $Organization;
 			ServerVerificationToken = "";