diff --git a/DokterApp/MainWindow.xaml b/DokterApp/MainWindow.xaml
index 59aedc4..03b3bd9 100644
--- a/DokterApp/MainWindow.xaml
+++ b/DokterApp/MainWindow.xaml
@@ -21,7 +21,7 @@
             <Label Content="Username" HorizontalContentAlignment="Center"/>
             <TextBox x:Name="Username" TextWrapping="Wrap" Width="120"/>
             <Label Content="Password" HorizontalContentAlignment="Center"/>
-            <TextBox x:Name="Password" TextWrapping="Wrap" Width="120"/>
+            <PasswordBox x:Name="Password" Width="120"/>
             <Button x:Name="Login" Content="Login" Margin="0,20,0,0" Click="Login_Click_1" />
         </StackPanel>
 
diff --git a/DokterApp/MainWindow.xaml.cs b/DokterApp/MainWindow.xaml.cs
index a0443bf..d2640b6 100644
--- a/DokterApp/MainWindow.xaml.cs
+++ b/DokterApp/MainWindow.xaml.cs
@@ -25,10 +25,8 @@ namespace DokterApp
         public MainWindow()
         {
             InitializeComponent();
-   
-        }
 
-        
+        }
 
         private void Login_Click_1(object sender, RoutedEventArgs e)
         {
@@ -36,16 +34,13 @@ namespace DokterApp
             handler = windowTabs.NewTab;
 
             this.Label.Content = "Waiting";
-            this.client = new Client("localhost", 5555, this.Username.Text, this.Password.Text, handler);
+            this.client = new Client("localhost", 5555, this.Username.Text, this.Password.Password, handler);
             while (!client.IsConnected())
             {
             }
-            
-            
+
             windowTabs.Show();
-            
             this.Close();
-            
         }
 
     }