diff --git a/src/modules/api/submodules/chat.ts b/src/modules/api/submodules/chat.ts
index 6cdb837..81434dc 100644
--- a/src/modules/api/submodules/chat.ts
+++ b/src/modules/api/submodules/chat.ts
@@ -45,28 +45,17 @@ function setup(data: SubmoduleData): void {
   io.use(socketAuth({ userDB: userDB }))
 
   io.on('connection', (socket: ExtendedSocket) => {
-    // TODO: UNCOMMENT
-    // -----------------------------------------------------------------
-    // const userid = socket.user.id
-    // logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
-    // -----------------------------------------------------------------
-
-    socket.on('join', function (data) {
-      // TODO: REMOVE
-      // -----------------------------------------------------------------
-      const userid = parseInt(data.id)
-      logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
-      // -----------------------------------------------------------------
+    const userid = socket.user.id
+    logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
 
+    socket.on('join', function (/*data*/) {
       socket.join(userid.toString())
-      let currUser: any = dbtools.Select(msgDB, 'users', {
+      let currUser: any = dbtools.Select(userDB, 'users', {
         id: userid,
       })
       if (!currUser || currUser.length === 0) {
-        currUser = {
-          id: userid,
-        }
-        dbtools.Insert(msgDB, 'users', currUser)
+        // TODO: handle somehow?
+        socket.disconnect()
       } else {
         currUser = currUser[0]
       }
@@ -134,7 +123,7 @@ function setup(data: SubmoduleData): void {
 
       socket.on('chat message', (message) => {
         const { reciever, msg, type } = message
-        const recieverUser = dbtools.Select(msgDB, 'users', {
+        const recieverUser = dbtools.Select(userDB, 'users', {
           id: reciever,
         })[0]
         if (!recieverUser) {