diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp
index f6a5e4a..f472160 100644
--- a/src/TNetwork.cpp
+++ b/src/TNetwork.cpp
@@ -296,7 +296,6 @@ void TNetwork::Authentication(SOCKET TCPSock) {
         return;
     }
 
-    RegisterThread("(" + std::to_string(Client->GetID()) + ") \"" + Client->GetName() + "\"");
     debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
     debug("There are " + std::to_string(mServer.ClientCount()) + " known clients");
     mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
@@ -475,6 +474,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
         mServer.RemoveClient(c);
         return;
     }
+    RegisterThread("(" + std::to_string(c.lock()->GetID()) + ") \"" + c.lock()->GetName() + "\"");
     OnConnect(c);
     while (true) {
         if (c.expired())