1 files changed, 5 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 3b92ac686..847503e42 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -13,6 +13,7 @@ using System.Windows;
 using Tango.Core.Commands;
 using Tango.Core.Cryptography;
 using Tango.Core.Helpers;
+using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Update;
 using Tango.Settings;
 using Tango.SharedUI;
@@ -102,10 +103,12 @@ namespace Tango.MachineStudio.Publisher
 
             UpdateVersions();
 
-            Email = SettingsManager.Default.MachineStudio.LastLoginEmail;
+            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+
+            Email = settings.LastLoginEmail;
 
             var cryptographer = new Rfc2898Cryptographer();
-            Password = cryptographer.Decrypt(SettingsManager.Default.MachineStudio.LastLoginPassword);
+            Password = cryptographer.Decrypt(settings.LastLoginPassword);
         }
 
         private void UpdateVersions()