1 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index 786951b06..f2a4f1143 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -86,7 +86,15 @@ namespace Tango.MachineStudio.UI.ViewModels
             cryptographer = new Rfc2898Cryptographer();
             Email = _settings.LastLoginEmail;
             RememberMe = _settings.RememberMe;
-            Password = cryptographer.Decrypt(_settings.LastLoginPassword);
+
+            try
+            {
+                Password = cryptographer.Decrypt(_settings.LastLoginPassword);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex);
+            }
         }
 
         /// <summary>