diff --git a/public/js/admin.js b/public/js/admin.js
index aebf5b0..44875eb 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -4,7 +4,7 @@ while(enteredPwd !== 'lemme in'){
 }
 const socket = io.connect('/');
 socket.on('users connected', function (data) {
-    document.querySelector('#num-users').innerHTML = data-1;
+    document.querySelector('#num-users').innerHTML = data;
 });
 
 socket.on('prompt completed', function (data) {
diff --git a/server.js b/server.js
index 9fafe4e..ea1961c 100644
--- a/server.js
+++ b/server.js
@@ -3,21 +3,15 @@ const app = express();
 const PORT = process.env.PORT || 3000;
 const http = require('http').Server(app);
 const socketserver = require('socket.io')(http);
-const usernames = [];
+let usernames = [];
 app.use(express.static('public'));
 
-let connectedUsers = 0;
 let currentComplete = 0;
 let currentPrompt = "Nothing Yet";
 socketserver.on('connection', (socket)=>{
-    connectedUsers++;
-    socketserver.emit('users connected', connectedUsers);
-    socketserver.emit('username list', usernames);
     socketserver.emit('prompt sent', currentPrompt);
-    socket.on('disconnect', ()=>{
-        connectedUsers--;
-        socketserver.emit('users connected', connectedUsers);
-    });
+    socketserver.emit('username list', usernames);
+    socketserver.emit('users connected', usernames.length);    
     socket.on('prompt sent', (prompt)=>{
         currentComplete = 0;
         currentPrompt = prompt;
@@ -34,6 +28,14 @@ socketserver.on('connection', (socket)=>{
     socket.on('user joined', (username)=>{
         usernames.push(username);
         socketserver.emit('username list', usernames);
+        socketserver.emit('users connected', usernames.length);
+    });
+    socket.on('user dropped', (username)=>{
+        usernames = usernames.filter((currentElement)=>{
+            return currentElement !== username;
+        });
+        socketserver.emit('username list', usernames);
+        socketserver.emit('users connected', usernames.length);
     });
 });