1 files changed, 3 insertions, 21 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs
index 027e37682..bf1dd389d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml.cs
@@ -22,26 +22,15 @@ namespace Tango.MachineStudio.UI.Views
     /// <summary>
     /// Interaction logic for LoginView.xaml
     /// </summary>
-    public partial class LoginView : UserControl, ITransitionView
+    public partial class LoginView : UserControl
     {
-        private Rfc2898Cryptographer cryptographer;
-
         public LoginView()
         {
             InitializeComponent();
-
-            cryptographer = new Rfc2898Cryptographer();
-        }
-
-        public String Password
-        {
-            get { return (String)GetValue(PasswordProperty); }
-            set { SetValue(PasswordProperty, value); }
+            this.Loaded += LoginView_Loaded;
         }
-        public static readonly DependencyProperty PasswordProperty =
-            DependencyProperty.Register("Password", typeof(String), typeof(LoginView), new PropertyMetadata(null));
 
-        public void OnTransitionCompleted()
+        private void LoginView_Loaded(object sender, RoutedEventArgs e)
         {
             txtEmail.Focus();
 
@@ -49,13 +38,6 @@ namespace Tango.MachineStudio.UI.Views
             {
                 txtPass.Focus();
             }
-
-            txtPass.Password = cryptographer.Decrypt(SettingsManager.Default.MachineStudio.LastLoginPassword);
-        }
-
-        private void txtPass_PasswordChanged(object sender, RoutedEventArgs e)
-        {
-            Password = txtPass.Password;
         }
     }
 }