diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
index 55e07e8..16f5a18 100644
--- a/src/routes/admin/+page.svelte
+++ b/src/routes/admin/+page.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
+	import { browser } from '$app/environment';
 	import { io, Socket } from 'socket.io-client';
+	const session_id = browser && localStorage.getItem('session_id');
 
 	let scout_queue: string[] = $state([]);
 	let robot_queue: string[] = $state([]);
 
 	let socket: Socket = io({
 		auth: {
-			token: 'celary'
+			token: 'celary',
+			username: 'admin'
 		}
 	});
 
diff --git a/src/routes/queue/+page.svelte b/src/routes/queue/+page.svelte
index bde4f72..5e5fe86 100644
--- a/src/routes/queue/+page.svelte
+++ b/src/routes/queue/+page.svelte
@@ -2,13 +2,11 @@
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
 	import { io, Socket } from 'socket.io-client';
-	const session_id = browser && (localStorage.getItem('session_id') ?? '');
 	const username = 'test_scout';
 	let socket: Socket;
 
 	socket = io({
 		auth: {
-			session_id,
 			username
 		}
 	});
@@ -21,8 +19,10 @@
 		goto(`/scout/${match_key}-${team_key}-${color}`);
 	});
 
-	socket.on('you_left_queue', () => {
-		goto('/');
+	socket.on('scout_left_queue', (scout: string) => {
+		if (scout === username) {
+			goto('/');
+		}
 	});
 
 	const leave = () => {
diff --git a/ws.ts b/ws.ts
index b8dfb55..c5b8057 100644
--- a/ws.ts
+++ b/ws.ts
@@ -13,14 +13,20 @@ const webSocketServer = {
 		const io = new Server(server.httpServer);
 
 		io.use((socket, next) => {
-			const session_id = socket.handshake.auth.session_id;
-
 			const username = socket.handshake.auth.username;
 			if (!username) {
 				return next(new Error('invalid username'));
 			}
-			if (session_id) sid_to_username.set(session_id, username);
-			// create new session
+
+			let old_entries = sid_to_username.entries().find(([_key, value]) => value == username);
+			if (old_entries) {
+				old_entries
+					.map(([key, _value]) => key)
+					.forEach((key) => sid_to_username.delete(key));
+			}
+
+			sid_to_username.set(socket.id, username);
+
 			next();
 		});
 
@@ -55,9 +61,9 @@ const webSocketServer = {
 					.toArray()[0];
 				console.log(scout_sid);
 				// This event exist in the cast that the scout removed itself from the queue
-				io.to('admin_room').emit('scout_left_queue', scout_id);
+				io.emit('scout_left_queue', scout_id);
 				// This event exists in the case that the admin removed the scout from the queue
-				io.to(scout_sid).emit('you_left_queue');
+				// io.to(scout_sid).emit('you_left_queue');
 				io.sockets.sockets.get(scout_sid)?.leave('scout_queue');
 			});