1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 9c4c2281d..7f558c0c9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -28,6 +28,7 @@ using Tango.MachineStudio.RML.Models;
 using Tango.BL.ActionLogs;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.BL.DTO;
+using Tango.Core.Cryptography;
 
 namespace Tango.MachineStudio.MachineDesigner.ViewModels
 {
@@ -642,6 +643,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;
 
+                    if (ActiveMachine.ActivationKey == null)
+                    {
+                        ActiveMachine.ActivationKey = PasswordGenerator.Generate(8, PasswordGenerator.PasswordType.Alpha,PasswordGenerator.PasswordCasing.Upper);
+                    }
+
                     View.NavigateTo(MachineDesignerNavigationView.MachineDetailsView);
                 }
                 catch (Exception ex)