diff --git a/apps/web/src/components/modals/basic.tsx b/apps/web/src/components/modals/basic.tsx
index dc4e48a..46eaa45 100644
--- a/apps/web/src/components/modals/basic.tsx
+++ b/apps/web/src/components/modals/basic.tsx
@@ -15,10 +15,7 @@ export function Basic({
   user,
   extra,
 }: {
-  user: Pick<
-    User,
-    "Display" | "Username" | "Avatar" | "OnlineStatus" | "Status"
-  >;
+  user: User;
   extra?: React.ReactNode;
 }) {
   const display = user.Display || user.Username || "Unknown";
@@ -60,9 +57,8 @@ export function Basic({
           </TooltipContent>
         </Tooltip>
       </div>
-      <div className="flex w-full flex-col items-start justify-center text-[15px]">
+      <div className="flex w-full flex-col items-start justify-center gap-1 text-[15px]">
         <p>{display}</p>
-        <p className="text-xs text-muted-foreground">{user.Status}</p>
       </div>
       <div className="pr-1">{extra}</div>
     </Button>
diff --git a/apps/web/src/components/modals/profile.tsx b/apps/web/src/components/modals/profile.tsx
index a4bddb2..6324ab5 100644
--- a/apps/web/src/components/modals/profile.tsx
+++ b/apps/web/src/components/modals/profile.tsx
@@ -4,20 +4,7 @@ import { Text } from "@methanium/ui/markdown";
 import { ChevronDown, ChevronUp } from "lucide-react";
 import { useState } from "react";
 
-export default function Profile({
-  user,
-}: {
-  user: Pick<
-    User,
-    | "UserId"
-    | "Display"
-    | "Username"
-    | "Avatar"
-    | "About"
-    | "IotaId"
-    | "PublicKey"
-  >;
-}) {
+export default function Profile({ user }: { user: User }) {
   const [showAdvancedInformation, setShowAdvancedInformation] = useState(false);
 
   return (
diff --git a/apps/web/src/components/navbar.tsx b/apps/web/src/components/navbar.tsx
index 2f1c115..6c86f96 100644
--- a/apps/web/src/components/navbar.tsx
+++ b/apps/web/src/components/navbar.tsx
@@ -91,15 +91,6 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
         {pathname === "/chat" && id && (
           <Wrapper
             userId={id}
-            fields={[
-              "UserId",
-              "Display",
-              "Username",
-              "Avatar",
-              "About",
-              "IotaId",
-              "PublicKey",
-            ]}
             component={(user) =>
               isMobile ? (
                 <p className="font-medium text-[1.07rem]">{user?.Display}</p>
diff --git a/apps/web/src/components/sidebar.tsx b/apps/web/src/components/sidebar.tsx
index 6c3de28..7a7c58b 100644
--- a/apps/web/src/components/sidebar.tsx
+++ b/apps/web/src/components/sidebar.tsx
@@ -35,7 +35,7 @@ import SidebarBox from "@tensamin/call/sidebarBox";
 import { useShowMobileNavbar } from "@/routes/app/useShowMobileNavbar";
 import { Ellipsis, Check } from "lucide-react";
 import { useState } from "react";
-import { useUser, type User } from "@tensamin/user/context";
+import type { User } from "@tensamin/user/context";
 import { mtp, userPresencePreferenceSchema } from "@tensamin/shared/data";
 import { useMTP } from "@tensamin/mtp";
 import {
@@ -64,7 +64,7 @@ function StatusDialog({
   saveSucceeded,
   setSaveSucceeded,
 }: {
-  user: Pick<User, "UserId" | "OnlineStatus" | "Status">;
+  user: User;
   open: boolean;
   onOpenChange: (open: boolean) => void;
   send: ReturnType<typeof useMTP>["send"];
@@ -77,8 +77,6 @@ function StatusDialog({
   saveSucceeded: boolean;
   setSaveSucceeded: (value: boolean) => void;
 }) {
-  const { updateProfile, updateState } = useUser();
-
   return (
     <Dialog
       open={open}
@@ -139,10 +137,9 @@ function StatusDialog({
           <DialogClose render={<Button variant="destructive">Cancel</Button>} />
           <Button
             onClick={async () => {
-              const validation = mtp.ChangeUserData.request.safeParse({
-                OnlineStatus: draftOnlineStatus,
-                Status: draftStatus,
-              });
+              const payload = { UserState: draftOnlineStatus };
+
+              const validation = mtp.SetUserState.request.safeParse(payload);
 
               if (!validation.success) {
                 setSaveSucceeded(false);
@@ -153,9 +150,17 @@ function StatusDialog({
               }
 
               try {
-                await send("ChangeUserData", validation.data);
-                updateState(user.UserId, draftOnlineStatus);
-                await updateProfile(user.UserId, { Status: draftStatus });
+                await send("SetUserState", validation.data);
+                const profileValidation = mtp.ChangeUserData.request.safeParse({
+                  Status: draftStatus,
+                });
+                if (!profileValidation.success) {
+                  throw new Error(
+                    profileValidation.error.issues[0]?.message ??
+                      "Invalid status data",
+                  );
+                }
+                await send("ChangeUserData", profileValidation.data);
                 setSaveSucceeded(true);
                 setErrorMessage("");
               } catch (err) {
@@ -204,14 +209,6 @@ export default function Sidebar() {
             <Wrapper
               loading={<Loading />}
               userId={"own"}
-              fields={[
-                "UserId",
-                "Display",
-                "Username",
-                "Avatar",
-                "OnlineStatus",
-                "Status",
-              ]}
               component={(user) => (
                 <>
                   <Basic
diff --git a/apps/web/src/components/status-options.ts b/apps/web/src/components/status-options.ts
index da1ebb5..58dfc2d 100644
--- a/apps/web/src/components/status-options.ts
+++ b/apps/web/src/components/status-options.ts
@@ -2,7 +2,7 @@ export const onlineStatusOptions = [
   { label: "Online", value: "user_online" },
   { label: "Idle", value: "user_idle" },
   { label: "Do not disturb", value: "user_dnd" },
-  { label: "On the toilet", value: "user_wc" },
+  { label: "Away", value: "user_wc" },
   { label: "Offline", value: "user_invisible" },
 ] as const;
 
diff --git a/apps/web/src/features/conversation/modal/conversation.tsx b/apps/web/src/features/conversation/modal/conversation.tsx
index 6f0396e..90a45a6 100644
--- a/apps/web/src/features/conversation/modal/conversation.tsx
+++ b/apps/web/src/features/conversation/modal/conversation.tsx
@@ -28,13 +28,6 @@ export default function ConversationModal({ userId }: { userId: number }) {
             <Wrapper
               loading={<Loading />}
               userId={userId}
-              fields={[
-                "Display",
-                "Username",
-                "Avatar",
-                "OnlineStatus",
-                "Status",
-              ]}
               component={(user) => <Basic user={user} />}
             />
           </div>
diff --git a/packages/call/src/components/buttons/invite.tsx b/packages/call/src/components/buttons/invite.tsx
index d49a643..b478529 100644
--- a/packages/call/src/components/buttons/invite.tsx
+++ b/packages/call/src/components/buttons/invite.tsx
@@ -63,7 +63,6 @@ export default function InviteButton({
             <Wrapper
               key={contact.UserId}
               userId={contact.UserId}
-              fields={["Display"]}
               loading={<div>Loading...</div>}
               component={(user) => (
                 <Button
diff --git a/packages/call/src/components/invitePopup.tsx b/packages/call/src/components/invitePopup.tsx
index 583c57d..ed26a1a 100644
--- a/packages/call/src/components/invitePopup.tsx
+++ b/packages/call/src/components/invitePopup.tsx
@@ -23,7 +23,6 @@ export default function InvitePopup({
   return (
     <Wrapper
       userId={user}
-      fields={["Avatar", "Display"]}
       loading={null}
       component={(user) => (
         <Dialog open={open} onOpenChange={setOpen}>
diff --git a/packages/call/src/components/modals/base.tsx b/packages/call/src/components/modals/base.tsx
index 7538728..a223869 100644
--- a/packages/call/src/components/modals/base.tsx
+++ b/packages/call/src/components/modals/base.tsx
@@ -16,15 +16,13 @@ import {
 } from "../../store";
 import { Track, type Participant } from "livekit-client";
 import { useEffect, useRef, useState } from "react";
-import { type SelectedUser, useUserFields } from "@tensamin/user/context";
+import { useUser, type User } from "@tensamin/user/context";
 import { useIsSpeaking } from "../../speakingState";
 import VideoViewer from "../videoViewer";
 import { HeadphoneOff, MicOff, Monitor, Plus, Shield } from "lucide-react";
 import ContextMenu from "./contextMenu";
 import { useStorage } from "@tensamin/storage/context";
 
-const USER_FIELDS = ["UserId", "Avatar", "Display"] as const;
-
 function getTrackPublicationBySource(
   participant: Participant | undefined,
   source: Track.Source,
@@ -115,7 +113,7 @@ function Overlay({
   participant,
 }: {
   type: "user" | "stream";
-  user: SelectedUser<typeof USER_FIELDS>;
+  user: User;
   participant: Participant;
 }) {
   const isAdmin = getRoomMetadata()?.admins.includes(user.UserId) === true;
@@ -165,16 +163,12 @@ export default function Base({
   fill?: boolean;
   flush?: boolean;
 }) {
+  const { get } = useUser();
   const { load } = useStorage();
 
   const focusedParticipantId = useCall((state) => state.focusedParticipantId);
   const view = useCall((state) => state.view);
-  const participantId = Number(participant?.identity);
-  const validParticipantId =
-    participant && Number.isInteger(participantId) && participantId > 0
-      ? participantId
-      : null;
-  const { data: user } = useUserFields(validParticipantId, USER_FIELDS);
+  const [user, setUser] = useState<User | null>(null);
   const [avatarBackgroundColor, setAvatarBackgroundColor] = useState<
     string | undefined
   >(undefined);
@@ -197,6 +191,31 @@ export default function Base({
     load("user_id").then(setOwnId);
   }, [load]);
 
+  useEffect(() => {
+    const participantId = Number(participant?.identity);
+
+    if (
+      !participant ||
+      !Number.isInteger(participantId) ||
+      participantId <= 0
+    ) {
+      setUser(null);
+      return;
+    }
+
+    let active = true;
+
+    void get(participantId).then((nextUser) => {
+      if (active) {
+        setUser(nextUser);
+      }
+    });
+
+    return () => {
+      active = false;
+    };
+  }, [participant, get]);
+
   useEffect(() => {
     if (type !== "user" || !user?.Avatar) {
       setAvatarBackgroundColor(undefined);
diff --git a/packages/call/src/components/modals/contextMenu.tsx b/packages/call/src/components/modals/contextMenu.tsx
index d063cee..1d63ca2 100644
--- a/packages/call/src/components/modals/contextMenu.tsx
+++ b/packages/call/src/components/modals/contextMenu.tsx
@@ -5,6 +5,7 @@ import {
   ContextMenuSeparator,
   Slider,
 } from "@methanium/ui";
+import type { User } from "@tensamin/user/context";
 import { setParticipantCameraDisabled, useCall } from "../../store";
 import { useState } from "react";
 
@@ -22,7 +23,7 @@ export default function ContextMenu({
   user,
   ownId,
 }: {
-  user: Readonly<{ UserId: number }>;
+  user: User;
   ownId: number;
 }) {
   const [muted, setMuted] = useState(false);
diff --git a/packages/call/src/components/popout.tsx b/packages/call/src/components/popout.tsx
index 54f76f1..f519ca0 100644
--- a/packages/call/src/components/popout.tsx
+++ b/packages/call/src/components/popout.tsx
@@ -14,12 +14,10 @@ import {
   useSidebar,
 } from "@methanium/ui";
 import { ScreenShareOff } from "lucide-react";
-import { useUserFields } from "@tensamin/user/context";
+import { useUser, type User } from "@tensamin/user/context";
 import { useIsSpeaking, useLastSpeakingParticipantId } from "../speakingState";
 import { getAverageImageColor } from "./modals/base";
 
-const USER_FIELDS = ["Avatar", "Display"] as const;
-
 function getTrackPublicationBySource(
   participant: Participant | undefined,
   source: Track.Source,
@@ -64,12 +62,10 @@ function MobileCallPill({
   callId: string;
 }) {
   const { setOpenMobile } = useSidebar();
+  const { get } = useUser();
   const lastSpeakingParticipantId = useLastSpeakingParticipantId();
   const isSpeaking = useIsSpeaking(lastSpeakingParticipantId ?? -1);
-  const { data: lastSpeakingUser } = useUserFields(
-    lastSpeakingParticipantId,
-    USER_FIELDS,
-  );
+  const [lastSpeakingUser, setLastSpeakingUser] = useState<User | null>(null);
   const [avatarBackgroundColor, setAvatarBackgroundColor] = useState<
     string | undefined
   >(undefined);
@@ -87,6 +83,25 @@ function MobileCallPill({
   const [coords, setCoords] = useState(initialCoords);
   const [isDragging, setIsDragging] = useState(false);
 
+  useEffect(() => {
+    if (lastSpeakingParticipantId == null) {
+      setLastSpeakingUser(null);
+      return;
+    }
+
+    let mounted = true;
+
+    void get(lastSpeakingParticipantId).then((user) => {
+      if (mounted) {
+        setLastSpeakingUser(user);
+      }
+    });
+
+    return () => {
+      mounted = false;
+    };
+  }, [get, lastSpeakingParticipantId]);
+
   useEffect(() => {
     if (!lastSpeakingUser?.Avatar) {
       setAvatarBackgroundColor(undefined);
diff --git a/packages/call/src/components/top.tsx b/packages/call/src/components/top.tsx
index d634662..60f1c7d 100644
--- a/packages/call/src/components/top.tsx
+++ b/packages/call/src/components/top.tsx
@@ -1,4 +1,4 @@
-import { useUserFields } from "@tensamin/user/context";
+import { useUser, type User } from "@tensamin/user/context";
 import { useCall, getRoom } from "../store";
 import { useEffect, useState } from "react";
 import { useStorage } from "@tensamin/storage/context";
@@ -11,43 +11,8 @@ import {
   TooltipTrigger,
 } from "@methanium/ui";
 
-const USER_FIELDS = ["Avatar", "Display"] as const;
-
-function ParticipantAvatar({
-  userId,
-  portalContainer,
-}: {
-  userId: number;
-  portalContainer?: HTMLElement;
-}) {
-  const { data: user } = useUserFields(userId, USER_FIELDS);
-  if (!user) return null;
-
-  return (
-    <div className="-ml-4">
-      <Tooltip>
-        <TooltipTrigger
-          render={
-            <Avatar className="size-7">
-              <AvatarImage src={user.Avatar} />
-              <AvatarFallback className="text-xs">
-                {user.Display.slice(0, 2).toUpperCase()}
-              </AvatarFallback>
-            </Avatar>
-          }
-        />
-        <TooltipContent
-          side="bottom"
-          portalProps={{ container: portalContainer }}
-        >
-          {user.Display}
-        </TooltipContent>
-      </Tooltip>
-    </div>
-  );
-}
-
 export default function TopBar() {
+  const { get } = useUser();
   const { load } = useStorage();
   const room = getRoom();
   const screenRef = useCall((state) => state.screenRef);
@@ -66,23 +31,65 @@ export default function TopBar() {
         : null;
     },
   ).filter((participantId): participantId is number => participantId != null);
-  const [ownId, setOwnId] = useState<number>();
+  const userIdsKey = userIds.join(",");
+
+  const [users, setUsers] = useState<User[]>([]);
 
   useEffect(() => {
-    void load("user_id").then(setOwnId);
-  }, [load]);
+    let active = true;
+    const ids = userIdsKey === "" ? [] : userIdsKey.split(",").map(Number);
 
-  const participantIds = ownId === undefined ? userIds : [ownId, ...userIds];
+    void Promise.all(ids.map((id) => get(id)))
+      .then(async (users) => {
+        if (!active) {
+          return;
+        }
+
+        const ownId = await load("user_id");
+        const ownUser = await get(ownId);
+
+        setUsers([ownUser, ...users]);
+      })
+      .catch(async () => {
+        if (!active) {
+          return;
+        }
+
+        const ownId = await load("user_id");
+        const ownUser = await get(ownId);
+
+        setUsers([ownUser]);
+      });
+
+    return () => {
+      active = false;
+    };
+  }, [get, userIdsKey, load]);
 
   return (
     <div className="w-full flex justify-between h-12">
       <div className="flex gap-1 m-3 ml-7">
-        {participantIds.map((userId) => (
-          <ParticipantAvatar
-            key={userId}
-            userId={userId}
-            portalContainer={portalContainer}
-          />
+        {users.map((user) => (
+          <div key={user.UserId} className="-ml-4">
+            <Tooltip>
+              <TooltipTrigger
+                render={
+                  <Avatar className="size-7">
+                    <AvatarImage src={user.Avatar} />
+                    <AvatarFallback className="text-xs">
+                      {user.Display.slice(0, 2).toUpperCase()}
+                    </AvatarFallback>
+                  </Avatar>
+                }
+              />
+              <TooltipContent
+                side="bottom"
+                portalProps={{ container: portalContainer }}
+              >
+                {user.Display}
+              </TooltipContent>
+            </Tooltip>
+          </div>
         ))}
       </div>
     </div>
diff --git a/packages/call/src/store.tsx b/packages/call/src/store.tsx
index 6f7f524..687919b 100644
--- a/packages/call/src/store.tsx
+++ b/packages/call/src/store.tsx
@@ -70,6 +70,7 @@ type SendFn = (
   data: Record<string, unknown>,
 ) => Promise<{ data: unknown }>;
 type LoadFn = (key: string) => Promise<unknown>;
+type GetUserFn = (userId: number) => Promise<{ PublicKey: string }>;
 type RemoteVideoTrackSelector = Track.Kind | Track.Source;
 
 type Runtime = {
@@ -79,7 +80,7 @@ type Runtime = {
   }) => Promise<void>;
   send: SendFn;
   load: LoadFn;
-  getPublicKey: (userId: number) => Promise<string>;
+  getUser: GetUserFn;
 };
 
 let _keyProvider: ExternalE2EEKeyProvider | null = null;
@@ -670,7 +671,9 @@ export async function sendCallInvite(userId: number) {
     throw new Error("Cannot send call invite without an active call.");
   }
 
-  const remotePublicKey = await runtime.getPublicKey(userId);
+  const remotePublicKey = await runtime
+    .getUser(userId)
+    .then((data) => data.PublicKey);
   const secretId = deriveCallSecretId(callId);
   const wrapped = await wrapCallSecret({
     callSecret,
@@ -1252,8 +1255,7 @@ export function useInitializeCall() {
       navigate,
       send: send as SendFn,
       load: load as LoadFn,
-      getPublicKey: (userId) =>
-        get(userId, ["PublicKey"]).then((user) => user.PublicKey),
+      getUser: get as GetUserFn,
     });
   }, [get, load, navigate, send]);
 
diff --git a/packages/call/src/views/preview.tsx b/packages/call/src/views/preview.tsx
index 80bad22..401332d 100644
--- a/packages/call/src/views/preview.tsx
+++ b/packages/call/src/views/preview.tsx
@@ -1,23 +1,54 @@
+import { useEffect, useState } from "react";
 import { useCall } from "../store";
-import { useUserFields } from "@tensamin/user/context";
-
-const USER_FIELDS = ["Display"] as const;
-
-function Participant({ userId }: { userId: number }) {
-  const { data: user } = useUserFields(userId, USER_FIELDS);
-  return user ? <p className="text-2xl">User: {user.Display}</p> : null;
-}
+import { useUser, type User } from "@tensamin/user/context";
 
 export default function Preview() {
+  const { get } = useUser();
   const currentCallData = useCall((state) => state.currentCallData);
 
+  const [data, setData] = useState<User[]>([]);
+
+  useEffect(() => {
+    let active = true;
+
+    if (!currentCallData?.exists) {
+      return () => {
+        active = false;
+      };
+    }
+
+    void Promise.all(currentCallData.UserIds.map((id) => get(id)))
+      .then((users) => {
+        if (!active) {
+          return;
+        }
+
+        setData(users);
+      })
+      .catch(() => {
+        if (!active) {
+          return;
+        }
+
+        setData([]);
+      });
+
+    return () => {
+      active = false;
+    };
+  }, [currentCallData, get]);
+
   return (
     <div className="w-full h-full flex items-center justify-center">
       {currentCallData?.exists ? (
         <div className="flex flex-col gap-2">
-          {currentCallData.UserIds.map((userId) => (
-            <Participant key={userId} userId={userId} />
-          ))}
+          {data.map((user) => {
+            return (
+              <p key={user.UserId} className="text-2xl">
+                User: {user.Display}
+              </p>
+            );
+          })}
         </div>
       ) : (
         <p className="text-2xl">Call expired</p>
diff --git a/packages/chat/src/components/media.tsx b/packages/chat/src/components/media.tsx
index 02ee6ef..a37f444 100644
--- a/packages/chat/src/components/media.tsx
+++ b/packages/chat/src/components/media.tsx
@@ -24,7 +24,7 @@ import {
 } from "lucide-react";
 import { useState, useMemo, useEffect, useRef, type WheelEvent } from "react";
 import MediaSaveButton from "./mediaSaveButton";
-import { useUserFields } from "@tensamin/user/context";
+import { type User, useUser } from "@tensamin/user/context";
 
 const zoomLevels = [1, 1.5, 2, 3];
 
@@ -46,7 +46,12 @@ export default function Media({
   const wheelDelta = useRef(0);
   const hostname = useMemo(() => new URL(link).hostname, [link]);
 
-  const { data: user } = useUserFields(senderId, ["Avatar", "Display"]);
+  // Get user's
+  const { get } = useUser();
+  const [user, setUser] = useState<undefined | User>(undefined);
+  useEffect(() => {
+    get(senderId).then(setUser);
+  }, [senderId, get]);
   const avatar = user?.Avatar
     ? `data:image/webp;base64,${user.Avatar}`
     : undefined;
diff --git a/packages/chat/src/components/message.tsx b/packages/chat/src/components/message.tsx
index 4dd6624..515b39d 100644
--- a/packages/chat/src/components/message.tsx
+++ b/packages/chat/src/components/message.tsx
@@ -1,7 +1,7 @@
 import type { RawMessage } from "../values";
 import { AlertTriangle, Check, CheckLine, RefreshCw } from "lucide-react";
 import { memo, useCallback, useEffect, useRef, useState } from "react";
-import { type SelectedUser, useUserFields } from "@tensamin/user/context";
+import type { User } from "@tensamin/user/context";
 
 import {
   Avatar,
@@ -21,6 +21,7 @@ import { decryptChatText, encryptChatText } from "@tensamin/crypto/chatSecret";
 import { log, toast } from "@tensamin/shared/log";
 import { Emoji, Input, normalizeShortcode, Text } from "@methanium/ui/markdown";
 import { useRecordEmojiUse } from "./emojiRanks";
+import { useUser } from "@tensamin/user/context";
 import ReplyBox from "./replyBox";
 import { useHotkey } from "@tensamin/hotkeys";
 import { cancelMessageEditHotkey } from "../hotkeys";
@@ -39,7 +40,7 @@ function MessageComponent({
     decryptionFailed?: boolean;
   };
   onSetEditing: (editing: boolean) => void;
-  user: SelectedUser<readonly ["UserId", "Avatar", "Display"]> | null;
+  user: User | null;
 }) {
   const actuallyFailed =
     (message.failed && message.MessageState === "awaiting") ||
@@ -149,14 +150,13 @@ function MessageComponent({
     removeReaction,
     replyTo,
   } = useChat();
+  const { get: getUser } = useUser();
   const [replyMessage, setReplyMessage] = useState<RawMessage | null>(null);
-  const { data: replyUser } = useUserFields(replyMessage?.SenderId ?? null, [
-    "Avatar",
-    "Display",
-  ]);
+  const [replyUser, setReplyUser] = useState<User | null>(null);
   useEffect(() => {
     if (!message.ReplyId || !ownId || !chatSecret) {
       setReplyMessage(null);
+      setReplyUser(null);
       return;
     }
 
@@ -168,20 +168,25 @@ function MessageComponent({
       send,
     })
       .then(async (reply) => {
-        const Content = await decryptChatText(chatSecret, reply.Content);
+        const [Content, author] = await Promise.all([
+          decryptChatText(chatSecret, reply.Content),
+          getUser(reply.SenderId),
+        ]);
         if (!active) return;
         setReplyMessage({ ...reply, Content });
+        setReplyUser(author);
       })
       .catch((err) => {
         if (!active) return;
         setReplyMessage(null);
+        setReplyUser(null);
         log(1, "chat", "red", "Failed to get replied-to message", err);
       });
 
     return () => {
       active = false;
     };
-  }, [chatSecret, message.ReplyId, ownId, send, userId]);
+  }, [chatSecret, getUser, message.ReplyId, ownId, send, userId]);
   const recordUse = useRecordEmojiUse();
   const editingRef = useRef(editing);
   const onSetEditingRef = useRef(onSetEditing);
diff --git a/packages/chat/src/components/replyBox.tsx b/packages/chat/src/components/replyBox.tsx
index fef038e..82417d0 100644
--- a/packages/chat/src/components/replyBox.tsx
+++ b/packages/chat/src/components/replyBox.tsx
@@ -7,13 +7,11 @@ import {
   Skeleton,
 } from "@methanium/ui";
 import { Text } from "@methanium/ui/markdown";
-import type { SelectedUser } from "@tensamin/user/context";
+import type { User } from "@tensamin/user/context";
 import Wrapper from "@tensamin/user/wrapper";
 import { Forward, X } from "lucide-react";
 
-type ReplyUserData = SelectedUser<readonly ["Avatar", "Display"]>;
-
-function ReplyUser({ user }: { user: ReplyUserData }) {
+function ReplyUser({ user }: { user: User }) {
   return (
     <div className="flex gap-1 items-center">
       <Avatar className="h-5 w-5 shrink-0">
@@ -42,7 +40,7 @@ export default function ReplyBox({
   content?: string;
   loading?: boolean;
   onDismiss?: () => void;
-  user?: ReplyUserData;
+  user?: User;
   userId?: number;
   variant: "composer" | "message";
 }) {
@@ -73,7 +71,6 @@ export default function ReplyBox({
             ) : userId ? (
               <Wrapper
                 userId={userId}
-                fields={["Avatar", "Display"]}
                 loading={<Skeleton className="h-5 w-5 rounded-full" />}
                 component={(resolvedUser) => <ReplyUser user={resolvedUser} />}
               />
diff --git a/packages/chat/src/context.tsx b/packages/chat/src/context.tsx
index b4f1f5b..5b6e796 100644
--- a/packages/chat/src/context.tsx
+++ b/packages/chat/src/context.tsx
@@ -458,7 +458,7 @@ export default function Provider({ children }: { children: ReactNode }) {
           secretId,
           version: CHAT_SECRET_VERSION,
         });
-        const peerUser = await getUser(userIdValue, ["PublicKey"]);
+        const peerUser = await getUser(userIdValue);
         const peerWrapped = await wrapChatSecret({
           chatSecret: rawSecret,
           recipientKemPublicKey: kemPublicKeyFromPublicKeyBundle(
diff --git a/packages/chat/src/screen.tsx b/packages/chat/src/screen.tsx
index 685b140..0587d54 100644
--- a/packages/chat/src/screen.tsx
+++ b/packages/chat/src/screen.tsx
@@ -598,7 +598,6 @@ export default function Screen() {
                           <Wrapper
                             key={getMessageRenderKey(message)}
                             userId={message.SenderId}
-                            fields={["UserId", "Avatar", "Display"]}
                             loading={null}
                             component={(user) => (
                               <>
diff --git a/packages/chat/todo.md b/packages/chat/todo.md
index 9ecfbeb..9e33228 100644
--- a/packages/chat/todo.md
+++ b/packages/chat/todo.md
@@ -7,4 +7,3 @@
 - Drop any unique reactions above 10
 - Reply jumping
 - Add emoji picker
-- Improve arrow-up hotkey
diff --git a/packages/notifications/src/context.tsx b/packages/notifications/src/context.tsx
index b5ddf0d..a63b906 100644
--- a/packages/notifications/src/context.tsx
+++ b/packages/notifications/src/context.tsx
@@ -99,11 +99,7 @@ export default function Provider(props: { children: React.ReactNode }) {
               }
             }
 
-            const user = await get(data.SenderId, [
-              "UserId",
-              "Display",
-              "Avatar",
-            ]);
+            const user = await get(data.SenderId);
 
             if (isTauri()) {
               if (!appFocused) return;
diff --git a/packages/notifications/todo.md b/packages/notifications/todo.md
index be726ed..599b984 100644
--- a/packages/notifications/todo.md
+++ b/packages/notifications/todo.md
@@ -1 +1,3 @@
+- Tauri notifications
+- Mobile notifications channel setup
 - Add notification symbol / outline to user modal
diff --git a/packages/settings/src/pages/profile.tsx b/packages/settings/src/pages/profile.tsx
index dc8de3c..7f8cd5a 100644
--- a/packages/settings/src/pages/profile.tsx
+++ b/packages/settings/src/pages/profile.tsx
@@ -11,25 +11,10 @@ import {
   Input,
   useIsMobile,
 } from "@methanium/ui";
-import {
-  useUser,
-  useUserFields,
-  type SelectedUser,
-} from "@tensamin/user/context";
+import { useUser, type User } from "@tensamin/user/context";
 import { Check } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 
-const PROFILE_FIELDS = [
-  "Avatar",
-  "Display",
-  "Username",
-  "About",
-  "UserId",
-] as const;
-type ProfileDraft = Partial<
-  Omit<SelectedUser<typeof PROFILE_FIELDS>, "UserId">
->;
-
 async function prepImage(
   file: File,
   size = 300,
@@ -59,13 +44,12 @@ async function prepImage(
 }
 
 export default function Page() {
-  const { updateProfile } = useUser();
+  const { get, update } = useUser();
   const { load } = useStorage();
   const { send } = useMTP();
   const isMobile = useIsMobile();
-  const [userId, setUserId] = useState<number | null>(null);
-  const { data: currentUser } = useUserFields(userId, PROFILE_FIELDS);
-  const [draftUser, setDraftUser] = useState<ProfileDraft>({});
+  const [currentUser, setCurrentUser] = useState<User | null>(null);
+  const [draftUser, setDraftUser] = useState<Partial<User>>({});
   const [errorMessage, setErrorMessage] = useState("");
   const [saveSucceeded, setSaveSucceeded] = useState(false);
   const avatarUploadRef = useRef<HTMLInputElement>(null);
@@ -73,23 +57,18 @@ export default function Page() {
   const effectiveAvatar =
     draftUser.Avatar === "none" ? undefined : draftUser.Avatar;
   const updateDraftUser = (
-    updater: (previous: ProfileDraft) => ProfileDraft,
+    updater: (previous: Partial<User>) => Partial<User>,
   ) => {
     setSaveSucceeded(false);
     setErrorMessage("");
     setDraftUser(updater);
   };
   useEffect(() => {
-    void load("user_id").then(setUserId);
-  }, [load]);
+    void (async () => setCurrentUser(await get(await load("user_id"))))();
+  }, [get, load]);
   useEffect(() => {
     if (!currentUser || draftInitializedRef.current) return;
-    setDraftUser({
-      Avatar: currentUser.Avatar,
-      Display: currentUser.Display,
-      Username: currentUser.Username,
-      About: currentUser.About,
-    });
+    setDraftUser(currentUser);
     draftInitializedRef.current = true;
   }, [currentUser]);
   async function handleAvatarUpload(file: File) {
@@ -148,7 +127,7 @@ export default function Page() {
           onChange={(event) =>
             updateDraftUser((previous) => ({
               ...previous,
-              Display: event.target.value,
+              display: event.target.value,
             }))
           }
           placeholder="Display Name"
@@ -159,7 +138,7 @@ export default function Page() {
           onChange={(event) =>
             updateDraftUser((previous) => ({
               ...previous,
-              Username: event.target.value,
+              username: event.target.value,
             }))
           }
           placeholder="Username"
@@ -171,7 +150,7 @@ export default function Page() {
           fontSize=".875rem"
           placeholder="About Me"
           setValue={(value) =>
-            updateDraftUser((previous) => ({ ...previous, About: value }))
+            updateDraftUser((previous) => ({ ...previous, about: value }))
           }
           value={draftUser.About || ""}
         />
@@ -201,7 +180,13 @@ export default function Page() {
               if (response.type.startsWith("Error")) {
                 throw new Error(response.type);
               }
-              await updateProfile(currentUser.UserId, validation.data);
+              const updatedUser = mtp.GetUserData.response.parse({
+                ...currentUser,
+                ...draftUser,
+              });
+              await update(updatedUser);
+              setCurrentUser(updatedUser);
+              setDraftUser(updatedUser);
               setSaveSucceeded(true);
               setErrorMessage("");
             } catch (error) {
diff --git a/packages/shared/src/data.ts b/packages/shared/src/data.ts
index 671e924..9f16723 100644
--- a/packages/shared/src/data.ts
+++ b/packages/shared/src/data.ts
@@ -260,13 +260,20 @@ export const mtp = {
       UserState: clientUserStateSchema,
     }),
   },
+  SetUserState: {
+    request: z.object({
+      UserState: userPresencePreferenceSchema,
+    }),
+    response: z.object({
+      UserState: userPresencePreferenceSchema,
+    }),
+  },
   ChangeUserData: {
     request: z
       .object({
         About: userFields.About,
         Avatar: userFields.Avatar,
         Display: userFields.Display,
-        OnlineStatus: userPresencePreferenceSchema,
         PublicKey: userFields.PublicKey,
         Status: userFields.Status,
         Username: userFields.Username,
diff --git a/packages/storage/todo.md b/packages/storage/todo.md
index 244fc2c..761fd8e 100644
--- a/packages/storage/todo.md
+++ b/packages/storage/todo.md
@@ -1 +1,2 @@
 - Add `notifications: number` to contacts
+- Store private key in a device bound session
diff --git a/packages/user/package.json b/packages/user/package.json
index 956cd0d..6c6a9b5 100644
--- a/packages/user/package.json
+++ b/packages/user/package.json
@@ -11,7 +11,6 @@
   "scripts": {
     "format": "pnpm exec prettier --write .",
     "lint": "eslint src",
-    "test": "vitest run",
     "build": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
diff --git a/packages/user/src/context.tsx b/packages/user/src/context.tsx
index 423661c..be741f4 100644
--- a/packages/user/src/context.tsx
+++ b/packages/user/src/context.tsx
@@ -4,10 +4,8 @@ import {
   useCallback,
   useContext,
   useEffect,
-  useMemo,
   useRef,
   useState,
-  useSyncExternalStore,
 } from "react";
 import { useMTP, type ProtocolMessage } from "@tensamin/mtp";
 
@@ -21,21 +19,9 @@ import type z from "zod";
 import { createCache } from "@tensamin/cache";
 import { useStorage } from "@tensamin/storage/context";
 import { useSession } from "@tensamin/storage/session";
-import { getChangedUserFields, selectUserFields } from "./selection";
-
-export { getChangedUserFields, selectUserFields } from "./selection";
 
 export type User = z.infer<typeof schemas.GetUserData.response>;
 type ClientUserState = z.infer<typeof clientUserStateSchema>;
-export type UserField = keyof User;
-export type UserFields = readonly [UserField, ...UserField[]];
-export type SelectedUser<Fields extends readonly UserField[]> = Readonly<
-  Pick<User, Fields[number]>
->;
-export type UserProfilePatch = Omit<
-  z.infer<typeof schemas.ChangeUserData.request>,
-  "OnlineStatus"
->;
 
 export function mergeTransientPresence<T extends { UserId: number }>(
   user: T,
@@ -48,22 +34,8 @@ export function mergeTransientPresence<T extends { UserId: number }>(
 const USER_CACHE_MAX_AGE = 5 * 60 * 1000;
 
 interface contextValue {
-  get<const Fields extends UserFields>(
-    userId: number,
-    fields: Fields,
-  ): Promise<SelectedUser<Fields>>;
-  peek<const Fields extends UserFields>(
-    userId: number,
-    fields: Fields,
-  ): SelectedUser<Fields> | undefined;
-  subscribe(
-    userId: number,
-    fields: readonly UserField[],
-    listener: () => void,
-  ): () => void;
-  getVersion(userId: number, fields: readonly UserField[]): string;
-  updateProfile(userId: number, patch: UserProfilePatch): Promise<void>;
-  updateState(userId: number, state: ClientUserState): void;
+  get(userId: number): Promise<User>;
+  update(user: User): Promise<void>;
 }
 
 const UserContext = createContext<contextValue | undefined>(undefined);
@@ -76,24 +48,16 @@ const UserContext = createContext<contextValue | undefined>(undefined);
 export default function UserProvider(props: { children: ReactNode }) {
   const storageRef = useRef<Record<number, User>>({});
   const pendingRef = useRef<Record<number, Promise<User> | undefined>>({});
-  const profileUpdateQueuesRef = useRef(new Map<number, Promise<void>>());
-  const profileGenerationsRef = useRef(new Map<number, number>());
   const checkedAtRef = useRef<Record<number, number>>({});
   const presenceRef = useRef(new Map<number, ClientUserState>());
   const durableProfileRef = useRef<Record<number, User>>({});
-  const listenersRef = useRef(
-    new Map<
-      number,
-      Set<{ fields: ReadonlySet<UserField>; listener: () => void }>
-    >(),
-  );
-  const revisionsRef = useRef(new Map<number, Map<UserField, number>>());
 
   const { send, subscribePush } = useMTP();
   const { load } = useStorage();
   const { contacts } = useSession();
   const [accountId, setAccountId] = useState<number | null>(null);
-  const accountIdRef = useRef<number | null>(null);
+  const [cacheVersion, setCacheVersion] = useState(0);
+  const [sessionId, setSessionId] = useState<number | null>(null);
   const contactsRef = useRef(contacts);
   const initialStatesRef = useRef(
     new Map<number, z.infer<typeof publicUserStateSchema>>(),
@@ -107,78 +71,40 @@ export default function UserProvider(props: { children: ReactNode }) {
     return mergeTransientPresence(user, presenceRef.current);
   }, []);
 
-  const publishUser = useCallback((userId: number, user?: User) => {
-    const previous = storageRef.current[userId];
-    if (user) storageRef.current[userId] = user;
-    else delete storageRef.current[userId];
-
-    const changedFields = getChangedUserFields(previous, user);
-    if (changedFields.length === 0) return;
-
-    let revisions = revisionsRef.current.get(userId);
-    if (!revisions) {
-      revisions = new Map();
-      revisionsRef.current.set(userId, revisions);
-    }
-    for (const field of changedFields) {
-      revisions.set(field, (revisions.get(field) ?? 0) + 1);
-    }
-
-    const changed = new Set<UserField>(changedFields);
-    for (const entry of listenersRef.current.get(userId) ?? []) {
-      if ([...entry.fields].some((field) => changed.has(field))) {
-        entry.listener();
-      }
-    }
-  }, []);
-
-  const installProfile = useCallback(
-    (profile: User) => {
-      durableProfileRef.current[profile.UserId] = profile;
-      publishUser(profile.UserId, mergeUserPresence(profile));
-    },
-    [mergeUserPresence, publishUser],
-  );
-
   const applyUserState = useCallback(
     (userId: number, state: ClientUserState, privateState = false) => {
-      const currentAccountId = accountIdRef.current;
       const known =
-        userId === currentAccountId ||
-        durableProfileRef.current[userId] !== undefined ||
+        userId === accountId ||
         contactsRef.current.some((contact) => contact.UserId === userId);
       if (!known) return false;
 
-      if (state === "user_invisible" && userId !== currentAccountId)
-        return false;
-      if (userId === currentAccountId && !privateState) return false;
-      if (presenceRef.current.get(userId) === state) return true;
+      if (state === "user_invisible" && userId !== accountId) return false;
+      if (userId === accountId && !privateState) return false;
 
       presenceRef.current.set(userId, state);
-      const profile = durableProfileRef.current[userId];
-      if (profile) publishUser(userId, mergeUserPresence(profile));
+      const current = storageRef.current[userId];
+      if (current) storageRef.current[userId] = mergeUserPresence(current);
+      setCacheVersion((version) => version + 1);
       return true;
     },
-    [mergeUserPresence, publishUser],
+    [accountId, mergeUserPresence],
   );
 
-  const removePresence = useCallback(
-    (userId: number) => {
-      const removed = presenceRef.current.delete(userId);
-      initialStatesRef.current.delete(userId);
-      delete checkedAtRef.current[userId];
-      if (!removed) return;
-      const profile = durableProfileRef.current[userId];
-      if (profile) publishUser(userId, profile);
-    },
-    [publishUser],
-  );
+  const removePresence = useCallback((userId: number) => {
+    presenceRef.current.delete(userId);
+    initialStatesRef.current.delete(userId);
+    delete checkedAtRef.current[userId];
+    setCacheVersion((version) => version + 1);
+  }, []);
 
   const handleStatePush = useCallback(
     async (message: ProtocolMessage) => {
-      if (!accountId) return;
+      if (!accountId || !sessionId) return;
       const data = message.data as Record<string, unknown>;
       if (message.type === "GetStates") {
+        if (Number(data.SessionId) !== sessionId) {
+          return;
+        }
         if (Array.isArray(data.MissingUserIds)) {
           for (const userId of data.MissingUserIds) {
             if (typeof userId === "number") removePresence(userId);
@@ -200,34 +126,36 @@ export default function UserProvider(props: { children: ReactNode }) {
         return;
       }
       if (message.type !== "ClientChanged") return;
+      if (Number(data.SessionId) !== sessionId) return;
       const parsed = schemas.ClientChanged.response.safeParse(data);
       if (!parsed.success) return;
       applyUserState(parsed.data.UserId, parsed.data.UserState, true);
     },
-    [accountId, applyUserState, removePresence],
+    [accountId, applyUserState, removePresence, sessionId],
   );
 
   useEffect(() => {
     void load("user_id").then((accountId) => {
-      accountIdRef.current = accountId;
       setAccountId(accountId);
     });
+    void load("session_id").then((value) => {
+      setSessionId(value);
+    });
   }, [load]);
 
-  const getAccountId = useCallback(async () => {
-    if (accountIdRef.current !== null) return accountIdRef.current;
-    const value = await load("user_id");
-    accountIdRef.current = value;
-    return value;
-  }, [load]);
-
   useEffect(() => {
-    if (!accountId) return;
+    if (!accountId || !sessionId) return;
     return subscribePush(handleStatePush);
-  }, [accountId, handleStatePush, subscribePush]);
+  }, [accountId, handleStatePush, sessionId, subscribePush]);
 
-  const loadUser = useCallback(
+  /**
+   * Executes get.
+   * @param userId Parameter userId.
+   * @returns Promise<User>.
+   */
+  const get = useCallback(
     async (userId: number): Promise<User> => {
+      void cacheVersion;
       if (userId == null) {
         throw new Error("userId is required");
       }
@@ -238,45 +166,39 @@ export default function UserProvider(props: { children: ReactNode }) {
       }
 
       const request = (async () => {
-        const cache = createCache(String(await getAccountId()));
+        const cache = createCache(String(accountId ?? userId));
         const cachedValue =
-          durableProfileRef.current[userId] ??
-          (await cache.profiles.get(userId));
+          storageRef.current[userId] ?? (await cache.profiles.get(userId));
         const cachedResult =
           schemas.GetUserData.response.safeParse(cachedValue);
         const cached = cachedResult.success ? cachedResult.data : undefined;
         if (cached) {
-          installProfile(cached);
+          durableProfileRef.current[userId] = cached;
+          const merged = mergeUserPresence(cached);
+          storageRef.current[userId] = merged;
           const checkedAt = checkedAtRef.current[userId];
           if (!checkedAt || Date.now() - checkedAt < USER_CACHE_MAX_AGE) {
             checkedAtRef.current[userId] = Date.now();
-            return storageRef.current[userId];
+            return merged;
           }
         }
         try {
-          const profileGeneration =
-            profileGenerationsRef.current.get(userId) ?? 0;
           const userData = await send("GetUserData", { UserId: userId });
           if (userData.type === "ErrorNotFound" || userData.data.UserId === 0) {
+            delete storageRef.current[userId];
             delete durableProfileRef.current[userId];
             delete checkedAtRef.current[userId];
-            publishUser(userId);
             await cache.profiles.delete(userId);
             throw new Error("GetUserData failed: user not found");
           }
           if (userData.type.startsWith("Error")) {
             throw new Error(`GetUserData failed: ${userData.type}`);
           }
-          if (
-            profileGeneration !==
-              (profileGenerationsRef.current.get(userId) ?? 0) &&
-            storageRef.current[userId]
-          ) {
-            return storageRef.current[userId];
-          }
-          installProfile(userData.data);
+          const user = mergeUserPresence(userData.data);
+          durableProfileRef.current[userId] = userData.data;
+          storageRef.current[userId] = user;
           checkedAtRef.current[userId] = Date.now();
-          return storageRef.current[userId];
+          return user;
         } catch (error) {
           if (cached && storageRef.current[userId]) {
             checkedAtRef.current[userId] = Date.now();
@@ -294,91 +216,26 @@ export default function UserProvider(props: { children: ReactNode }) {
         delete pendingRef.current[userId];
       }
     },
-    [getAccountId, installProfile, publishUser, send],
+    [accountId, cacheVersion, mergeUserPresence, send],
   );
 
-  const get = useCallback(
-    async <const Fields extends UserFields>(
-      userId: number,
-      fields: Fields,
-    ): Promise<SelectedUser<Fields>> => {
-      return selectUserFields(await loadUser(userId), fields);
+  const update = useCallback(
+    async (user: User) => {
+      const durableProfile = {
+        ...user,
+        OnlineStatus:
+          durableProfileRef.current[user.UserId]?.OnlineStatus ??
+          user.OnlineStatus,
+      } as User;
+      await createCache(String(accountId ?? user.UserId)).profiles.put(
+        durableProfile,
+      );
+      durableProfileRef.current[user.UserId] = durableProfile;
+      storageRef.current[user.UserId] = mergeUserPresence(durableProfile);
+      checkedAtRef.current[user.UserId] = Date.now();
+      setCacheVersion((version) => version + 1);
     },
-    [loadUser],
-  );
-
-  const peek = useCallback(
-    <const Fields extends UserFields>(userId: number, fields: Fields) => {
-      const user = storageRef.current[userId];
-      return user ? selectUserFields(user, fields) : undefined;
-    },
-    [],
-  );
-
-  const subscribe = useCallback(
-    (userId: number, fields: readonly UserField[], listener: () => void) => {
-      let listeners = listenersRef.current.get(userId);
-      if (!listeners) {
-        listeners = new Set();
-        listenersRef.current.set(userId, listeners);
-      }
-      const entry = { fields: new Set(fields), listener };
-      listeners.add(entry);
-      return () => {
-        listeners.delete(entry);
-        if (listeners.size === 0) listenersRef.current.delete(userId);
-      };
-    },
-    [],
-  );
-
-  const getVersion = useCallback(
-    (userId: number, fields: readonly UserField[]) => {
-      const revisions = revisionsRef.current.get(userId);
-      return fields
-        .map((field) => `${field}:${revisions?.get(field) ?? 0}`)
-        .join("|");
-    },
-    [],
-  );
-
-  const updateProfile = useCallback(
-    async (userId: number, patch: UserProfilePatch) => {
-      const previousUpdate = profileUpdateQueuesRef.current.get(userId);
-      const update = (
-        previousUpdate?.catch(() => undefined) ?? Promise.resolve()
-      ).then(async () => {
-        const current = durableProfileRef.current[userId];
-        if (!current) throw new Error(`User ${userId} is not loaded`);
-        profileGenerationsRef.current.set(
-          userId,
-          (profileGenerationsRef.current.get(userId) ?? 0) + 1,
-        );
-        const profile = schemas.GetUserData.response.parse({
-          ...current,
-          ...patch,
-        });
-        installProfile(profile);
-        checkedAtRef.current[userId] = Date.now();
-        await createCache(String(await getAccountId())).profiles.put(profile);
-      });
-      profileUpdateQueuesRef.current.set(userId, update);
-      try {
-        await update;
-      } finally {
-        if (profileUpdateQueuesRef.current.get(userId) === update) {
-          profileUpdateQueuesRef.current.delete(userId);
-        }
-      }
-    },
-    [getAccountId, installProfile],
-  );
-
-  const updateState = useCallback(
-    (userId: number, state: ClientUserState) => {
-      applyUserState(userId, state, true);
-    },
-    [applyUserState],
+    [accountId, mergeUserPresence],
   );
 
   useEffect(() => {
@@ -390,7 +247,7 @@ export default function UserProvider(props: { children: ReactNode }) {
       ].filter((userId, index, all) => all.indexOf(userId) === index);
       for (const userId of userIds) {
         try {
-          await loadUser(userId);
+          await get(userId);
           const state = initialStatesRef.current.get(userId);
           if (state && applyUserState(userId, state)) {
             initialStatesRef.current.delete(userId);
@@ -400,22 +257,12 @@ export default function UserProvider(props: { children: ReactNode }) {
         }
       }
     })();
-  }, [accountId, applyUserState, contacts, loadUser]);
-
-  const value = useMemo(
-    () => ({
-      get,
-      peek,
-      subscribe,
-      getVersion,
-      updateProfile,
-      updateState,
-    }),
-    [get, getVersion, peek, subscribe, updateProfile, updateState],
-  );
+  }, [accountId, applyUserState, contacts, get]);
 
   return (
-    <UserContext.Provider value={value}>{props.children}</UserContext.Provider>
+    <UserContext.Provider value={{ get, update }}>
+      {props.children}
+    </UserContext.Provider>
   );
 }
 
@@ -431,63 +278,3 @@ export function useUser(): contextValue {
   }
   return context;
 }
-
-export type UserLoadState<Fields extends readonly UserField[]> =
-  | { data: undefined; error: undefined; loading: true }
-  | { data: undefined; error: unknown; loading: false }
-  | { data: SelectedUser<Fields>; error: undefined; loading: false };
-
-export function useUserFields<const Fields extends UserFields>(
-  userId: number | null,
-  fields: Fields,
-): UserLoadState<Fields> {
-  const { get, getVersion, peek, subscribe } = useUser();
-  const fieldKey = fields.join("|");
-  const selectedFields = useMemo(
-    () => fieldKey.split("|") as unknown as Fields,
-    [fieldKey],
-  );
-  const requestKey = `${userId ?? "unresolved"}:${fieldKey}`;
-  const [failure, setFailure] = useState<{
-    error: unknown;
-    requestKey: string;
-  }>();
-
-  const version = useSyncExternalStore(
-    useCallback(
-      (listener) =>
-        userId === null
-          ? () => undefined
-          : subscribe(userId, selectedFields, listener),
-      [selectedFields, subscribe, userId],
-    ),
-    useCallback(
-      () =>
-        userId === null ? "unresolved" : getVersion(userId, selectedFields),
-      [getVersion, selectedFields, userId],
-    ),
-    () => "server",
-  );
-
-  useEffect(() => {
-    if (userId === null) return;
-    let active = true;
-    void get(userId, selectedFields).catch((nextError: unknown) => {
-      if (active) setFailure({ error: nextError, requestKey });
-    });
-    return () => {
-      active = false;
-    };
-  }, [get, requestKey, selectedFields, userId]);
-
-  const data = useMemo(() => {
-    void version;
-    return userId === null ? undefined : peek(userId, selectedFields);
-  }, [peek, selectedFields, userId, version]);
-
-  if (data) return { data, error: undefined, loading: false };
-  if (failure?.requestKey === requestKey) {
-    return { data: undefined, error: failure.error, loading: false };
-  }
-  return { data: undefined, error: undefined, loading: true };
-}
diff --git a/packages/user/src/selection.test.ts b/packages/user/src/selection.test.ts
deleted file mode 100644
index 4235945..0000000
--- a/packages/user/src/selection.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import type { User } from "./context";
-import { getChangedUserFields, selectUserFields } from "./selection";
-
-const user = {
-  Avatar: undefined,
-  Display: "Alice",
-  IotaId: 1,
-  OmikronConnections: [],
-  OnlineStatus: "user_online",
-  PublicKey: "AA==",
-  SubEnd: 0,
-  SubLevel: 0,
-  UserId: 1,
-  Username: "alice",
-} satisfies User;
-
-describe("presence selection", () => {
-  it("notifies OnlineStatus selections when presence changes", () => {
-    const next = { ...user, OnlineStatus: "user_dnd" as const };
-
-    expect(getChangedUserFields(user, next)).toEqual(["OnlineStatus"]);
-    expect(selectUserFields(next, ["OnlineStatus"])).toEqual({
-      OnlineStatus: "user_dnd",
-    });
-  });
-});
diff --git a/packages/user/src/selection.ts b/packages/user/src/selection.ts
deleted file mode 100644
index 57b0fe3..0000000
--- a/packages/user/src/selection.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { User, UserField, UserFields, SelectedUser } from "./context";
-
-const USER_FIELD_MAP = {
-  About: true,
-  Avatar: true,
-  Display: true,
-  IotaId: true,
-  OmikronConnections: true,
-  OmikronId: true,
-  OnlineStatus: true,
-  PublicKey: true,
-  Status: true,
-  SubEnd: true,
-  SubLevel: true,
-  UserId: true,
-  Username: true,
-} satisfies Record<UserField, true>;
-
-const USER_FIELDS = Object.keys(USER_FIELD_MAP) as UserField[];
-
-export function selectUserFields<const Fields extends UserFields>(
-  user: User,
-  fields: Fields,
-): SelectedUser<Fields> {
-  return Object.fromEntries(
-    fields.map((field) => [field, user[field]]),
-  ) as SelectedUser<Fields>;
-}
-
-export function getChangedUserFields(
-  previous: User | undefined,
-  next: User | undefined,
-): UserField[] {
-  if ((previous === undefined) !== (next === undefined)) {
-    return [...USER_FIELDS];
-  }
-  return USER_FIELDS.filter(
-    (field) => !Object.is(previous?.[field], next?.[field]),
-  );
-}
diff --git a/packages/user/src/wrapper.tsx b/packages/user/src/wrapper.tsx
index 2a8752f..5f13e54 100644
--- a/packages/user/src/wrapper.tsx
+++ b/packages/user/src/wrapper.tsx
@@ -1,47 +1,48 @@
 import { useEffect, useState } from "react";
-import { type SelectedUser, type UserFields, useUserFields } from "./context";
+import { useUser, type User } from "./context";
 
 import { failedUser } from "@tensamin/shared/data";
 import { useStorage } from "@tensamin/storage/context";
 
 // Wrapper function to pass user data to some component
-export default function Wrapper<const Fields extends UserFields>(props: {
+export default function Wrapper(props: {
   userId: number | "own";
-  fields: Fields;
   loading: React.ReactNode;
-  component: (user: SelectedUser<Fields>) => React.ReactNode;
+  component: (user: User) => React.ReactNode;
 }) {
+  const { get } = useUser();
   const { load } = useStorage();
-  const [ownUserId, setOwnUserId] = useState<number | null>(null);
-  const [ownUserError, setOwnUserError] = useState(false);
+  const [user, setUser] = useState<User | null>(null);
 
   useEffect(() => {
-    if (props.userId !== "own") return;
+    if (props.userId == null) return;
+
     let active = true;
-    void load("user_id").then(
-      (value) => {
+
+    void (async () => {
+      try {
+        const userId =
+          props.userId === "own" ? await load("user_id") : props.userId;
+        const value = await get(userId);
+
         if (active) {
-          setOwnUserId(value);
-          setOwnUserError(false);
+          setUser(value);
         }
-      },
-      () => {
-        if (active) setOwnUserError(true);
-      },
-    );
+      } catch {
+        if (active) {
+          setUser(failedUser);
+        }
+      }
+    })();
+
     return () => {
       active = false;
     };
-  }, [load, props.userId]);
+  }, [load, get, props.userId]);
 
-  const userId = props.userId === "own" ? ownUserId : props.userId;
-  const result = useUserFields(userId, props.fields);
-  if (
-    (props.userId === "own" && ownUserError) ||
-    (!result.loading && !result.data)
-  ) {
-    return <>{props.component(failedUser as SelectedUser<Fields>)}</>;
+  if (props.userId == null) {
+    return <>{props.component(failedUser)}</>;
   }
 
-  return <>{result.data ? props.component(result.data) : props.loading}</>;
+  return <>{user ? props.component(user) : props.loading}</>;
 }