diff --git a/src/framework/UI_WebSocketClientServer.cpp b/src/framework/UI_WebSocketClientServer.cpp
index 27c985a..7484bdf 100644
--- a/src/framework/UI_WebSocketClientServer.cpp
+++ b/src/framework/UI_WebSocketClientServer.cpp
@@ -27,8 +27,6 @@ namespace OpenWifi {
         DBG;
         auto ClientSocket = Client->WS_->impl()->sockfd();
         DBG;
-        Clients_[ClientSocket] = std::move(Client);
-        DBG;
 
         Client->WS_->setNoDelay(true);
         Client->WS_->setKeepAlive(true);
@@ -49,6 +47,8 @@ namespace OpenWifi {
 
         std::cout << "B: WS: User -> " << UserName << std::endl;
         DBG;
+        Clients_[ClientSocket] = std::move(Client);
+        DBG;
 
     }