1 files changed, 4 insertions, 7 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 3fffc2045..b64b624fe 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -75,13 +75,10 @@ namespace Tango.PPC.Common.MachineUpdate
 
         private Task Login(String serialNumber)
         {
-            return Task.Factory.StartNew(() =>
+            return _client.Login(new LoginRequest()
             {
-                return _client.Login(new LoginRequest()
-                {
-                    Mode = LoginMode.Machine,
-                    SerialNumber = serialNumber,
-                }).Result;
+                Mode = LoginMode.Machine,
+                SerialNumber = serialNumber,
             });
         }
 
@@ -310,7 +307,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).Wait();
+                Login(serialNumber).GetAwaiter().GetResult();
 
                 LogManager.Log($"Checking if updates available...");