diff --git a/ui/src/graphql/streams.gql b/ui/src/graphql/streams.gql
index 138ef8d9..5cdc9285 100644
--- a/ui/src/graphql/streams.gql
+++ b/ui/src/graphql/streams.gql
@@ -1,51 +1,53 @@
 query Streams($cursor: String) {
-  streams(cursor: $cursor) {
-    totalCount
-    cursor
-    items {
-      id
-      name
-      description
-      role
-      isPublic
-      createdAt
-      updatedAt
-      collaborators {
+  activeUser {
+    streams(cursor: $cursor) {
+      totalCount
+      cursor
+      items {
         id
         name
-        company
-        avatar
+        description
         role
-      }
-      commits(limit: 1) {
-        totalCount
-        items {
-          id
-          createdAt
-          message
-          authorId
-          branchName
-          authorName
-          authorAvatar
-          referencedObject
-        }
-      }
-      branches {
-        totalCount
-        items {
+        isPublic
+        createdAt
+        updatedAt
+        collaborators {
           id
           name
-          commits(limit: 10) {
-            totalCount
-            items {
-              id
-              createdAt
-              message
-              authorId
-              branchName
-              authorName
-              authorAvatar
-              referencedObject
+          company
+          avatar
+          role
+        }
+        commits(limit: 1) {
+          totalCount
+          items {
+            id
+            createdAt
+            message
+            authorId
+            branchName
+            authorName
+            authorAvatar
+            referencedObject
+          }
+        }
+        branches {
+          totalCount
+          items {
+            id
+            name
+            commits(limit: 10) {
+              totalCount
+              items {
+                id
+                createdAt
+                message
+                authorId
+                branchName
+                authorName
+                authorAvatar
+                referencedObject
+              }
             }
           }
         }
diff --git a/ui/src/graphql/user.gql b/ui/src/graphql/user.gql
index 91b07d73..0cfca66b 100644
--- a/ui/src/graphql/user.gql
+++ b/ui/src/graphql/user.gql
@@ -1,5 +1,5 @@
 query {
-  user {
+  user:activeUser {
     id
     email
     name
diff --git a/ui/src/graphql/userById.gql b/ui/src/graphql/userById.gql
index 44e717ff..526408a6 100644
--- a/ui/src/graphql/userById.gql
+++ b/ui/src/graphql/userById.gql
@@ -1,13 +1,11 @@
 query User($id: String!) {
-  user(id: $id) {
+  user:otherUser(id: $id) {
     id
-    email
     name
     bio
     company
     avatar
     verified
-    profiles
     role
   }
 }