diff --git a/public/js/index.js b/public/js/index.js
index 618d46f..3554745 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -10,47 +10,51 @@ document.getElementById('ok').addEventListener('click', function () {
     username = document.getElementById('username').value;
     room_name = document.getElementById('room').value;
 
-    socket = io("/", {
-        closeOnBeforeunload: false
-    });
+    if (username !== "" && room_name !== "") {
+        socket = io("/", {
+            closeOnBeforeunload: false
+        });
 
-    // Login
-    socket.emit('add user', {'username': username, 'room_name': room_name});
+        // Login
+        socket.emit('add user', {'username': username, 'room_name': room_name});
 
 
-    socket.on('login', function () {
-        connected = true;
+        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();
+            document.getElementById('login').style.display = 'none';
+            document.getElementById('game').style.display = 'flex';
+            document.getElementById('chat').style.display = 'flex';
+            start_game();
+            resize();
 
-        addLogMessage("Welcome " + username + "!");
-    });
+            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('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('new message', function (data) {
+            addChatMessage(data);
+        });
 
-    socket.on('user joined', function (data) {
-        addLogMessage(data + ' joined');
-    });
+        socket.on('user joined', function (data) {
+            addLogMessage(data + ' joined');
+        });
 
-    socket.on('user left', function (data) {
-        addLogMessage(data + ' left');
-    });
+        socket.on('user left', function (data) {
+            addLogMessage(data + ' left');
+        });
+    } else {
+        document.getElementById('error').innerText = 'Username and/or room name cannot be empty!';
+    }
 });
 
 function open_manual() {