diff --git a/src/Room.jsx b/src/Room.jsx
index 1b8b49e7..654eaec7 100644
--- a/src/Room.jsx
+++ b/src/Room.jsx
@@ -26,13 +26,7 @@ import {
   ScreenshareButton,
   LinkButton,
 } from "./button";
-import {
-  Header,
-  LeftNav,
-  RightNav,
-  RoomHeaderInfo,
-  RoomSetupHeaderInfo,
-} from "./Header";
+import { Header, LeftNav, RightNav, RoomHeaderInfo } from "./Header";
 import { GroupCallState } from "matrix-js-sdk/src/webrtc/groupCall";
 import VideoGrid, {
   useVideoGridLayout,
@@ -217,6 +211,7 @@ export function GroupCallView({
       <InRoomView
         groupCall={groupCall}
         client={client}
+        isGuest={isGuest}
         roomName={groupCall.room.name}
         microphoneMuted={microphoneMuted}
         localVideoMuted={localVideoMuted}
@@ -284,7 +279,6 @@ export function EnteringRoomView() {
 
 function RoomSetupView({
   client,
-  isGuest,
   roomName,
   state,
   onInitLocalCallFeed,
@@ -313,13 +307,7 @@ function RoomSetupView({
           <RoomHeaderInfo roomName={roomName} />
         </LeftNav>
         <RightNav>
-          {isGuest ? (
-            <LinkButton to={{ pathname: "/login", state: { from: location } }}>
-              Log in
-            </LinkButton>
-          ) : (
-            <UserMenu />
-          )}
+          <UserMenu />
         </RightNav>
       </Header>
       <div className={styles.joinRoom}>
@@ -385,6 +373,7 @@ function RoomSetupView({
 
 function InRoomView({
   client,
+  isGuest,
   groupCall,
   roomName,
   microphoneMuted,
@@ -464,7 +453,7 @@ function InRoomView({
         </LeftNav>
         <RightNav>
           <GridLayoutMenu layout={layout} setLayout={setLayout} />
-          <UserMenu disableLogout />
+          {!isGuest && <UserMenu disableLogout />}
         </RightNav>
       </Header>
       {items.length === 0 ? (
diff --git a/src/UserMenu.jsx b/src/UserMenu.jsx
index 0e6037d1..a79b1425 100644
--- a/src/UserMenu.jsx
+++ b/src/UserMenu.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from "react";
-import { Button } from "./button";
+import { Button, LinkButton } from "./button";
 import { PopoverMenuTrigger } from "./PopoverMenu";
 import { ReactComponent as UserIcon } from "./icons/User.svg";
 import { ReactComponent as LoginIcon } from "./icons/Login.svg";
@@ -48,33 +48,41 @@ export function UserMenu({ disableLogout }) {
   const items = useMemo(() => {
     const arr = [];
 
-    if (isAuthenticated) {
+    if (isAuthenticated && !isGuest) {
       arr.push({
         key: "user",
         icon: UserIcon,
         label: displayName || userName,
       });
-    }
 
-    if (!isAuthenticated || isGuest || isPasswordlessUser) {
-      arr.push({
-        key: "login",
-        label: "Sign In",
-        icon: LoginIcon,
-      });
-    }
+      if (isPasswordlessUser) {
+        arr.push({
+          key: "login",
+          label: "Sign In",
+          icon: LoginIcon,
+        });
+      }
 
-    if (isAuthenticated && !isGuest && !isPasswordlessUser && !disableLogout) {
-      arr.push({
-        key: "logout",
-        label: "Sign Out",
-        icon: LogoutIcon,
-      });
+      if (!isPasswordlessUser && !disableLogout) {
+        arr.push({
+          key: "logout",
+          label: "Sign Out",
+          icon: LogoutIcon,
+        });
+      }
     }
 
     return arr;
   }, [isAuthenticated, isGuest, userName, displayName]);
 
+  if (isGuest || !isAuthenticated) {
+    return (
+      <LinkButton to={{ pathname: "/login", state: { from: location } }}>
+        Log in
+      </LinkButton>
+    );
+  }
+
   return (
     <>
       <PopoverMenuTrigger placement="bottom right">