1 files changed, 23 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml.cs
index c0bfdc25d..c5161b477 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml.cs
@@ -23,6 +23,29 @@ namespace Tango.MachineStudio.UI.Views
         public MachineLoginView()
         {
             InitializeComponent();
+
+            this.Loaded += MachineLoginView_Loaded;
+        }
+
+        private void MachineLoginView_Loaded(object sender, RoutedEventArgs e)
+        {
+            txtPass.Focusable = true;
+            txtPass.Focus();
+            txtPass.Password = String.Empty;
+            Password = String.Empty;
+        }
+
+        public String Password
+        {
+            get { return (String)GetValue(PasswordProperty); }
+            set { SetValue(PasswordProperty, value); }
+        }
+        public static readonly DependencyProperty PasswordProperty =
+            DependencyProperty.Register("Password", typeof(String), typeof(MachineLoginView), new PropertyMetadata(null));
+
+        private void txtPass_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            Password = txtPass.Password;
         }
     }
 }