diff --git a/ErgometerDoctorApplication/Client/PanelClientSetData.cs b/ErgometerDoctorApplication/Client/PanelClientSetData.cs
index 4361053..cdb4e31 100644
--- a/ErgometerDoctorApplication/Client/PanelClientSetData.cs
+++ b/ErgometerDoctorApplication/Client/PanelClientSetData.cs
@@ -283,6 +283,5 @@ namespace ErgometerDoctorApplication.Client
             MainClient.SendNetCommand(new NetCommand(NetCommand.ValueType.TIME, seconds, Session));
             textBox1.Text = "";
         }
-
     }
 }
diff --git a/ErgometerDoctorApplication/ConClientData.cs b/ErgometerDoctorApplication/ConClientData.cs
index b3514ff..221de0b 100644
--- a/ErgometerDoctorApplication/ConClientData.cs
+++ b/ErgometerDoctorApplication/ConClientData.cs
@@ -1,7 +1,9 @@
 using ErgometerLibrary;
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Security.AccessControl;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,6 +17,8 @@ namespace ErgometerDoctorApplication
         public System.Windows.Forms.TextBox textBoxUsername;
         public System.Windows.Forms.Button buttonCreate;
         public System.Windows.Forms.ListBox listUsers;
+        public System.Windows.Forms.Label newUsername;
+        public System.Windows.Forms.Label newPassword;
 
         public ConClientData() : base()
         {
@@ -22,35 +26,37 @@ namespace ErgometerDoctorApplication
             this.textBoxPassword = new System.Windows.Forms.TextBox();
             this.textBoxUsername = new System.Windows.Forms.TextBox();
             this.listUsers = new System.Windows.Forms.ListBox();
+            this.newUsername = new System.Windows.Forms.Label();
+            this.newPassword = new System.Windows.Forms.Label();
 
             // 
             // buttonLogin
             // 
-            this.buttonCreate.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.buttonCreate.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.buttonCreate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.buttonCreate.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.buttonCreate.Location = new System.Drawing.Point(0, -40);
+            this.buttonCreate.Location = new System.Drawing.Point(20, 215);
             this.buttonCreate.Name = "buttonCreate";
             this.buttonCreate.Size = new System.Drawing.Size(168, 31);
             this.buttonCreate.TabIndex = 3;
             this.buttonCreate.Text = "Aanmaken";
-            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.BackColor = Color.LightGray;
             this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
             // 
             // textBoxPassword
             // 
-            this.textBoxPassword.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.textBoxPassword.Location = new System.Drawing.Point(0, 0);
+            this.textBoxPassword.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.textBoxPassword.Location = new System.Drawing.Point(170, 180);
             this.textBoxPassword.MaxLength = 16;
             this.textBoxPassword.Name = "textBoxPassword";
-            this.textBoxPassword.Size = new System.Drawing.Size(167, 20);
+            this.textBoxPassword.Size = new System.Drawing.Size(167, 60);
             this.textBoxPassword.TabIndex = 2;
             this.textBoxPassword.KeyDown += TextBoxEnterPress;
             // 
             // textBoxUsername
             // 
-            this.textBoxUsername.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.textBoxUsername.Location = new System.Drawing.Point(0, 40);
+            this.textBoxUsername.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.textBoxUsername.Location = new System.Drawing.Point(170, 150);
             this.textBoxUsername.MaxLength = 16;
             this.textBoxUsername.Name = "textBoxUsername";
             this.textBoxUsername.Size = new System.Drawing.Size(167, 20);
@@ -59,23 +65,44 @@ namespace ErgometerDoctorApplication
             //
             // listUsers
             //
-            this.listUsers.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.listUsers.Location = new System.Drawing.Point(0, 80);
+            this.listUsers.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.listUsers.Location = new System.Drawing.Point(20, -150);
             this.listUsers.Name = "listUsers";
-            this.listUsers.Size = new System.Drawing.Size(200, 400);
-            this.listUsers.ItemHeight = 25;
+            this.listUsers.Size = new System.Drawing.Size(200, 280);
             this.listUsers.Items.Add("No Users");
-            this.listUsers.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            //
+            // newPassword
+            //
+            this.newPassword.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.newPassword.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.newPassword.ForeColor = Color.Black;
+            this.newPassword.Location = new System.Drawing.Point(20, 182);
+            this.newPassword.Name = "newPassword";
+            this.newPassword.Size = new System.Drawing.Size(167, 20);
+            this.newPassword.TabIndex = 3;
+            this.newPassword.Text = "Nieuw wachtwoord";
+            //
+            // newUsername
+            //
+            this.newUsername.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.newUsername.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.newUsername.Location = new System.Drawing.Point(20, 152);
+            this.newUsername.Name = "newUsername";
+            this.newUsername.Size = new System.Drawing.Size(167, 20);
+            this.newUsername.TabIndex = 3;
+            this.newUsername.Text = "Nieuwe gebruikersnaam";
 
             this.Controls.Add(this.listUsers);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.textBoxUsername);
             this.Controls.Add(this.textBoxPassword);
+            this.Controls.Add(this.newUsername);
+            this.Controls.Add(this.newPassword);
             // 
             // ConClientData
             // 
             this.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.Location = new System.Drawing.Point(0, 0);
+            this.Location = new System.Drawing.Point(20, 0);
             this.Name = "ConClientData";
             this.Size = new System.Drawing.Size(584, 459);
             this.TabIndex = 0;