1 files changed, 8 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs
index 6126594c5..d675a348f 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs
@@ -98,9 +98,9 @@ namespace Tango.MachineService.Controllers
                     throw new AuthenticationException("The specified serial number could not be found.");
                 }
 
-                if (machine.OsKey == null)
+                if (machine.SetupActivation && machine.OsKey == null)
                 {
-                    throw new InvalidDataException("The specified machine is not associated with an OS activation key.");
+                    throw new InvalidDataException("The specified machine is configured to perform an OS activation but is not associated with an OS activation key.");
                 }
 
                 var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
@@ -134,6 +134,12 @@ namespace Tango.MachineService.Controllers
                 response.DbUserName = credentials.UserName;
                 response.DbPassword = credentials.Password;
                 response.OSKey = machine.OsKey;
+                response.SetupActivation = machine.SetupActivation;
+                response.SetupRemoteAssistance = machine.SetupRemoteAssistance;
+                response.SetupUWF = machine.SetupUwf;
+                response.SetupFirmware = machine.SetupFirmware;
+                response.IsDemo = machine.IsDemo;
+
             }
 
             return response;