diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo
index 2cf926d..8dfd396 100644
Binary files a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo and b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo differ
diff --git a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs
index 7b87357..429a914 100644
--- a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs
+++ b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs
@@ -58,7 +58,7 @@ namespace ErgometerApplication
 
         public void validateLogin(string username, string password)
         {
-            if (username.Length >= 4)
+            if (username.Length > 0)
             {
                 if (password.Length == 0)
                 {
@@ -66,13 +66,7 @@ namespace ErgometerApplication
                     panelLogin.lblVerification.ForeColor = Color.Red;
                     panelLogin.lblVerification.Visible = true;
                 }
-                if (password.Length > 0 && password.Length < 4)
-                {
-                    panelLogin.lblVerification.Text = "Vul een wachtwoord in van minimaal 4 karakters.";
-                    panelLogin.lblVerification.ForeColor = Color.Red;
-                    panelLogin.lblVerification.Visible = true;
-                }
-                if (password.Length >= 3)
+                if (password.Length > 0)
                 {
                     string error = "";
                     bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error);
@@ -96,7 +90,7 @@ namespace ErgometerApplication
             }
             else
             {
-                panelLogin.lblVerification.Text = "Vul een gebruikersnaam in van minimaal 4 karakters.";
+                panelLogin.lblVerification.Text = "Vul een gebruikersnaam in.";
                 panelLogin.lblVerification.ForeColor = Color.Red;
                 panelLogin.lblVerification.Visible = true;
             }
@@ -136,6 +130,11 @@ namespace ErgometerApplication
         {
             panelLogin.BringToFront();
             panelTopBar.Visible = false;
+            panelLogin.lblVerification.Text = "U bent uitgelogd.";
+            panelLogin.lblVerification.ForeColor = Color.Blue;
+            panelLogin.lblVerification.Visible = true;
+            panelLogin.textBoxUsername.Text = "";
+            panelLogin.textBoxPassword.Text = "";
             sessionLogout();
             updateTimer.Stop();
         }
diff --git a/ErgometerApplication/ErgometerApplication/PanelLogin.cs b/ErgometerApplication/ErgometerApplication/PanelLogin.cs
index e265523..151a3a0 100644
--- a/ErgometerApplication/ErgometerApplication/PanelLogin.cs
+++ b/ErgometerApplication/ErgometerApplication/PanelLogin.cs
@@ -91,6 +91,7 @@ namespace ErgometerApplication
             this.textBoxUsername.Name = "textBoxUsername";
             this.textBoxUsername.Size = new System.Drawing.Size(167, 20);
             this.textBoxUsername.TabIndex = 2;
+            this.textBoxUsername.KeyDown += TextBoxPassword_KeyDown;
             // 
             // lblLoginTitle
             // 
diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll
index bdeafa8..42517bb 100644
Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll differ