1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
index b716ed1fb..7a0a9414c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
@@ -152,6 +152,8 @@ namespace Tango.MachineStudio.UI.TFS
                 throw LogManager.Default.Log(new AuthenticationException($"User '{user_email}' is not part of the Tango VSTS team. Please contact your administrator."));
             }
 
+            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+
             item.CreatedBy = currentUser;
             item.ChangedBy = currentUser;
             item.AuthorizedAs = currentUser;
@@ -161,7 +163,8 @@ namespace Tango.MachineStudio.UI.TFS
             item.Severity = Severity.Medium;
             item.State = State.New;
             item.Type = WorkItemType.Bug;
-            item.Environment = SettingsManager.Default.GetOrCreate<MachineStudioSettings>().DeploymentSlot.ToDescription();
+            item.Environment = settings.DeploymentSlot.ToDescription();
+            item.MachineType = (MachineType)settings.LastConnectedMachineType;
 
             foreach (var window in Application.Current.Windows.OfType<Window>().Where(x => !String.IsNullOrWhiteSpace(x.Title)))
             {