diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index 7544baf..accc07e 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -93,7 +93,7 @@ namespace Server.Models
                 
                 case JSONConvert.LOGIN:
                     // json log in username data
-                    string uName = JSONConvert.GetUsernameLogin(message);
+                    string uName = JSONConvert.GetUsernameLogin(payload);
                     if (uName != null)
                     {
                         User = new User(uName);
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index de853eb..dac7455 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -25,9 +25,12 @@ namespace SharedClientServer
             return payload.username;
         }
 
-        public static byte[] GetUsernameMessage(string username)
+        public static byte[] GetUsernameMessage(string uName)
         {
-
+            return GetMessageToSend(LOGIN, new
+            {
+                username = uName
+            });
         }
 
         /// <summary>