diff --git a/src/pages/Terminals.tsx b/src/pages/Terminals.tsx
index 916116c..dd90aac 100644
--- a/src/pages/Terminals.tsx
+++ b/src/pages/Terminals.tsx
@@ -181,7 +181,8 @@ export default function Terminals(props: Props) {
   const load = useCallback(() => {
     if(loading) return
     setLoading(true)
-    terminalAPI.listTerminals(200, 0, "asc", "name", as).then(resp => {
+    terminalAPI.listTerminals(200, 0, "asc", "name", undefined, as).then(resp => {
+      console.log(resp.data)
       if(resp.data.terminals){
         setTerminals(resp.data.terminals.map(a => Terminal.any(a)));
       }
diff --git a/src/user/UserMenu.tsx b/src/user/UserMenu.tsx
index c22b622..a65b935 100644
--- a/src/user/UserMenu.tsx
+++ b/src/user/UserMenu.tsx
@@ -166,7 +166,7 @@ export default function UserMenu() {
     );
   };
 
-  if (user.id().length < 1) return unauthenticatedUserMenu()
+  if (user.id()?.length < 1) return unauthenticatedUserMenu()
 
   const hasAdmin = user.hasFeature ? user.hasFeature("admin") : false;
 
@@ -182,7 +182,7 @@ export default function UserMenu() {
           <UserTeamName user={user} team={team} />
         </Box>
         <Box style={{ marginLeft: theme.spacing(1) }}>
-          {picture && hasTeams && team.id().length > 0 ? (
+          {picture && hasTeams && team.id()?.length > 0 ? (
             <div>
               <UserAvatar
                 user={user}
@@ -238,7 +238,7 @@ export default function UserMenu() {
         {hasTeams && (
           <MenuItem
             onClick={() => {
-              if (as.length > 1) {
+              if (as?.length > 1) {
                 user.settings.useTeam = false;
                 dispatch({ key: "as", value: "" });
                 userAPI.updateUser(user.id(), user.protobuf()).then(_resp => {
@@ -252,13 +252,13 @@ export default function UserMenu() {
                 });
               }
             }}
-            disabled={user.settings.defaultTeam.length < 1}
+            disabled={user.settings.defaultTeam?.length < 1}
             aria-label="Open Team Menu"
             dense>
             <ListItemIcon>
               <Checkbox
-                disabled={user.settings.defaultTeam.length < 1}
-                checked={as.length > 1}
+                disabled={user.settings.defaultTeam?.length < 1}
+                checked={as?.length > 1}
                 style={{ margin: 0, padding: 0 }}
               />
             </ListItemIcon>