diff --git a/public/js/chat.js b/public/js/chat.js
index e758a5a..2ab44df 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -1,43 +1,6 @@
 let socket;
 let connected = false;
 
-function start_chat() {
-    socket.on('login', function () {
-        connected = true;
-
-        document.getElementById('login').style.display = 'none';
-        document.getElementById('game').style.display = 'flex';
-        document.getElementById('chat').style.display = 'flex';
-        start_chat();
-        start_game();
-        resize();
-
-        addLogMessage("Welcome " + username + "!");
-    });
-
-    socket.on('error', function (data) {
-        if (data === 'Game started already or room has two many members') {
-            document.getElementById('login').style.display = 'flex';
-            document.getElementById('game').style.display = 'none';
-            document.getElementById('chat').style.display = 'none';
-            document.getElementById('error').innerText = data;
-        }
-        console.log(data);
-    });
-
-    socket.on('new message', function (data) {
-        addChatMessage(data);
-    });
-
-    socket.on('user joined', function (data) {
-        addLogMessage(data + ' joined');
-    });
-
-    socket.on('user left', function (data) {
-        addLogMessage(data + ' left');
-    });
-}
-
 function sendMessage() {
     let message = document.getElementById('message_input').value;
 
diff --git a/public/js/index.js b/public/js/index.js
index 93968bd..8493e39 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -14,8 +14,41 @@ document.getElementById('ok').addEventListener('click', function () {
         closeOnBeforeunload: false
     });
 
-    start_chat();
-
     // Login
     socket.emit('add user', {'username': username, 'room_name': room_name});
+
+
+    socket.on('login', function () {
+        connected = true;
+
+        document.getElementById('login').style.display = 'none';
+        document.getElementById('game').style.display = 'flex';
+        document.getElementById('chat').style.display = 'flex';
+        start_game();
+        resize();
+
+        addLogMessage("Welcome " + username + "!");
+    });
+
+    socket.on('error', function (data) {
+        if (data === 'Game started already or room has two many members') {
+            document.getElementById('login').style.display = 'flex';
+            document.getElementById('game').style.display = 'none';
+            document.getElementById('chat').style.display = 'none';
+            document.getElementById('error').innerText = data;
+        }
+        console.log(data);
+    });
+
+    socket.on('new message', function (data) {
+        addChatMessage(data);
+    });
+
+    socket.on('user joined', function (data) {
+        addLogMessage(data + ' joined');
+    });
+
+    socket.on('user left', function (data) {
+        addLogMessage(data + ' left');
+    });
 });
\ No newline at end of file