1 files changed, 24 insertions, 13 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index 29daedb4c..2177efecc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -235,10 +235,21 @@ namespace Tango.PPC.Common.MachineSetup
 
                 Login(serialNumber).Wait();
 
+                String deviceName = $"Tango-{serialNumber}-{settings.DeploymentSlot.ToString()}";
+                LogManager.Log($"Settings device name: '{deviceName}'...");
+                try
+                {
+                    await _windows_manager.SetDeviceName(deviceName);
+                }
+                catch
+                {
+                    throw new IOException("Error setting device name.");
+                }
+
                 MachineSetupRequest request = new MachineSetupRequest();
                 request.SerialNumber = serialNumber;
                 request.DeviceID = await _windows_manager.GetDeviceId();
-                request.DeviceName = await _windows_manager.GetDeviceName();
+                request.DeviceName = deviceName;
 
                 try
                 {
@@ -278,20 +289,20 @@ namespace Tango.PPC.Common.MachineSetup
                         UpdateProgress("Activating operation system license", "Activating...");
                         await _windows_manager.Activate(setup_response.OSKey);
                     }
+                }
 
-                    if (setup_response.SetupRemoteAssistance)
-                    {
-                        LogManager.Log("Installing remote assistance...");
-                        UpdateProgress("Installing remote assistance", "Installing...");
-                        await _remoteAssistance.InstallRemoteAssistance(serialNumber, settings.DeploymentSlot.ToString());
-                    }
+                if (setup_response.SetupRemoteAssistance)
+                {
+                    LogManager.Log("Installing remote assistance...");
+                    UpdateProgress("Installing remote assistance", "Installing...");
+                    await _remoteAssistance.InstallRemoteAssistance(serialNumber, setup_response.Organization, settings.DeploymentSlot.ToString());
+                }
 
-                    if (setup_response.SetupUWF)
-                    {
-                        LogManager.Log("Activating unified write filter...");
-                        UpdateProgress("Activating disk protection", "Activating...");
-                        await _uwf.Setup();
-                    }
+                if (setup_response.SetupUWF)
+                {
+                    LogManager.Log("Activating unified write filter...");
+                    UpdateProgress("Activating disk protection", "Activating...");
+                    await _uwf.Setup();
                 }
 
                 //Create temporary folders for packages.