diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 1c93794..9f7dd10 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -475,9 +475,9 @@ export default class RoomClient
 		window.open(url, 'loginWindow');
 	}
 
-	logout()
+	logout(roomId = this._roomId)
 	{
-		window.open('/auth/logout', 'logoutWindow');
+		window.open(`/auth/logout?peerId=${this._peerId}&roomId=${roomId}`, 'logoutWindow');
 	}
 
 	receiveLoginChildWindow(data)
diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js
index 3d2596f..0ad8ef8 100644
--- a/app/src/components/JoinDialog.js
+++ b/app/src/components/JoinDialog.js
@@ -224,7 +224,7 @@ const JoinDialog = ({
 					myPicture={myPicture}
 					onLogin={() =>
 					{
-						loggedIn ? roomClient.logout() : roomClient.login(roomId);
+						loggedIn ? roomClient.logout(roomId) : roomClient.login(roomId);
 					}}
 					loggedIn={loggedIn}
 				>