diff --git a/src/chat/main/client.c b/src/chat/main/client.c
index e5ce425..b1f51ac 100644
--- a/src/chat/main/client.c
+++ b/src/chat/main/client.c
@@ -294,7 +294,15 @@ int main(void)
                 __why2_set_asking_password(0);
             } else
             {
-                why2_send_socket(line, NULL, listen_socket); //NULL IS SENT BECAUSE IT IS USELESS TO SEND USER FROM CLIENT - SERVER WON'T USE IT
+                if (__why2_get_asking_username())
+                {
+                    __why2_set_asking_username(0);
+
+                    why2_send_socket_code(line, NULL, listen_socket, WHY2_CHAT_CODE_USERNAME);
+                } else
+                {
+                    why2_send_socket(line, NULL, listen_socket); //NULL IS SENT BECAUSE IT IS USELESS TO SEND USER FROM CLIENT - SERVER WON'T USE IT
+                }
             }
 
             free(line);
diff --git a/src/chat/misc.c b/src/chat/misc.c
index d9ec904..36b1294 100644
--- a/src/chat/misc.c
+++ b/src/chat/misc.c
@@ -1109,6 +1109,8 @@ void *why2_listen_server(void *socket)
                 exiting = 1; //EXIT THIS THREAD
             } else if (strcmp(code, WHY2_CHAT_CODE_PICK_USERNAME) == 0 || strcmp(code, WHY2_CHAT_CODE_INVALID_USERNAME) == 0) //PICK USERNAME (COULD BE CAUSE BY INVALID USERNAME)
             {
+                __why2_set_asking_username(1);
+
                 if (strcmp(code, WHY2_CHAT_CODE_INVALID_USERNAME) == 0) //INVALID USERNAME
                 {
                     printf(WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP "%s\nInvalid username!\n\n\n", asking_username > 1 ? WHY2_CLEAR_AND_GO_UP : "");