diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index afb1d78..d2ab9bc 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -465,9 +465,9 @@ export default class RoomClient
 		});
 	}
 
-	login()
+	login(roomId = this._roomId)
 	{
-		const url = `/auth/login?peerId=${this._peerId}&roomId=${this._roomId}`;
+		const url = `/auth/login?peerId=${this._peerId}&roomId=${roomId}`;
 
 		window.open(url, 'loginWindow');
 	}
diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js
index d7b63d4..130e39d 100644
--- a/app/src/components/JoinDialog.js
+++ b/app/src/components/JoinDialog.js
@@ -217,7 +217,7 @@ const JoinDialog = ({
 					myPicture={myPicture}
 					onLogin={() =>
 					{
-						loggedIn ? roomClient.logout() : roomClient.login();
+						loggedIn ? roomClient.logout() : roomClient.login(roomId);
 					}}
 					loggedIn={loggedIn}
 				>