diff --git a/packages/keychain/src/components/home.tsx b/packages/keychain/src/components/home.tsx
index cc6527d066..d533abda3d 100644
--- a/packages/keychain/src/components/home.tsx
+++ b/packages/keychain/src/components/home.tsx
@@ -54,23 +54,37 @@ export function Home() {
     return <Authenticate />;
   }
 
-  // No controller, send to login
-  if (!controller) {
+  // Allow viewing certain pages without controller
+  const publicPaths = [
+    "/account/", // Allow viewing any account inventory
+  ];
+  const isPublicPath = publicPaths.some((path) => pathname.startsWith(path));
+
+  // No controller, send to login (unless on public path)
+  if (!controller && !isPublicPath) {
     return <CreateController isSlot={pathname.startsWith("/slot")} />;
   }
 
-  if (!upgrade.isSynced || isConfigLoading) {
-    // This is likely never observable in a real application but just in case.
-    return <PageLoading />;
-  }
+  // Skip upgrade checks if no controller (viewing public path)
+  if (controller) {
+    if (!upgrade.isSynced || isConfigLoading) {
+      // This is likely never observable in a real application but just in case.
+      return <PageLoading />;
+    }
 
-  if (upgrade.available) {
-    return <Upgrade />;
+    if (upgrade.available) {
+      return <Upgrade />;
+    }
   }
 
   return (
     <Layout>
       {(() => {
+        // If no controller and on public path, just show the outlet
+        if (!controller && isPublicPath) {
+          return <Outlet />;
+        }
+
         switch (context?.type) {
           case "connect": {
             // if no policies, we can connect immediately
@@ -101,13 +115,13 @@ export function Home() {
                 onConnect={() => {
                   context.resolve({
                     code: ResponseCodes.SUCCESS,
-                    address: controller.address(),
+                    address: controller!.address(),
                   });
                 }}
                 onSkip={() => {
                   context.resolve({
                     code: ResponseCodes.SUCCESS,
-                    address: controller.address(),
+                    address: controller!.address(),
                   });
                 }}
               />
diff --git a/packages/keychain/src/components/inventory/collection/collection-asset.tsx b/packages/keychain/src/components/inventory/collection/collection-asset.tsx
index 28ad3130b4..030ebd2bfe 100644
--- a/packages/keychain/src/components/inventory/collection/collection-asset.tsx
+++ b/packages/keychain/src/components/inventory/collection/collection-asset.tsx
@@ -39,12 +39,14 @@ import { useAccount } from "@/hooks/account";
 import { useConnection, useControllerTheme } from "@/hooks/connection";
 import { useNavigation } from "@/context/navigation";
 import { createExecuteUrl } from "@/utils/connection/execute";
+import { useViewerAddress } from "@/hooks/viewer";
 
 const OFFSET = 10;
 
 export function CollectionAsset() {
   const { chainId, project } = useConnection();
   const account = useAccount();
+  const { canPerformActions } = useViewerAddress();
   const explorer = useExplorer();
   const address = account?.address || "";
   const [searchParams, setSearchParams] = useSearchParams();
@@ -305,66 +307,68 @@ export function CollectionAsset() {
             </div>
           </LayoutContent>
 
-          <LayoutFooter
-            className={cn(
-              "relative flex flex-col items-center justify-center gap-y-4 bg-background-100 pt-0 select-none",
-              !isListed && !isOwner && "hidden",
-            )}
-          >
-            <div className="flex gap-3 w-full">
-              <Button
-                variant="secondary"
-                isLoading={loading}
-                onClick={handleUnlist}
-                className={cn(
-                  "w-full gap-2 text-destructive-100",
-                  (!isListed || !isOwner) && "hidden",
-                )}
-              >
-                <TagIcon variant="solid" size="sm" />
-                Unlist
-              </Button>
-              <Link
-                className={cn(
-                  "flex items-center justify-center gap-x-4 w-full",
-                  (isListed || !isOwner) && "hidden",
-                )}
-                to={`list?${searchParams.toString()}`}
-              >
-                <Button variant="secondary" className={cn("w-full gap-2")}>
-                  <TagIcon variant="solid" size="sm" />
-                  List
-                </Button>
-              </Link>
-              <Link
-                className={cn(
-                  "flex items-center justify-center gap-x-4 w-full",
-                  (!isListed || isOwner) && "hidden",
-                )}
-                to={`purchase?${searchParams.toString()}`}
-              >
+          {canPerformActions && (
+            <LayoutFooter
+              className={cn(
+                "relative flex flex-col items-center justify-center gap-y-4 bg-background-100 pt-0 select-none",
+                !isListed && !isOwner && "hidden",
+              )}
+            >
+              <div className="flex gap-3 w-full">
                 <Button
+                  variant="secondary"
                   isLoading={loading}
-                  variant="primary"
-                  className="w-full gap-2"
+                  onClick={handleUnlist}
+                  className={cn(
+                    "w-full gap-2 text-destructive-100",
+                    (!isListed || !isOwner) && "hidden",
+                  )}
                 >
-                  Purchase
-                </Button>
-              </Link>
-              <Link
-                className={cn(
-                  "flex items-center justify-center gap-x-4 w-full",
-                  !isOwner && "hidden",
-                )}
-                to={`send?${searchParams.toString()}`}
-              >
-                <Button variant="secondary" className="w-full gap-2">
-                  <PaperPlaneIcon variant="solid" size="sm" />
-                  Send
+                  <TagIcon variant="solid" size="sm" />
+                  Unlist
                 </Button>
-              </Link>
-            </div>
-          </LayoutFooter>
+                <Link
+                  className={cn(
+                    "flex items-center justify-center gap-x-4 w-full",
+                    (isListed || !isOwner) && "hidden",
+                  )}
+                  to={`list?${searchParams.toString()}`}
+                >
+                  <Button variant="secondary" className={cn("w-full gap-2")}>
+                    <TagIcon variant="solid" size="sm" />
+                    List
+                  </Button>
+                </Link>
+                <Link
+                  className={cn(
+                    "flex items-center justify-center gap-x-4 w-full",
+                    (!isListed || isOwner) && "hidden",
+                  )}
+                  to={`purchase?${searchParams.toString()}`}
+                >
+                  <Button
+                    isLoading={loading}
+                    variant="primary"
+                    className="w-full gap-2"
+                  >
+                    Purchase
+                  </Button>
+                </Link>
+                <Link
+                  className={cn(
+                    "flex items-center justify-center gap-x-4 w-full",
+                    !isOwner && "hidden",
+                  )}
+                  to={`send?${searchParams.toString()}`}
+                >
+                  <Button variant="secondary" className="w-full gap-2">
+                    <PaperPlaneIcon variant="solid" size="sm" />
+                    Send
+                  </Button>
+                </Link>
+              </div>
+            </LayoutFooter>
+          )}
         </>
       )}
     </>
diff --git a/packages/keychain/src/components/inventory/collection/collection.tsx b/packages/keychain/src/components/inventory/collection/collection.tsx
index e45f52e735..1b386021c4 100644
--- a/packages/keychain/src/components/inventory/collection/collection.tsx
+++ b/packages/keychain/src/components/inventory/collection/collection.tsx
@@ -26,6 +26,7 @@ import { useControllerTheme } from "@/hooks/connection";
 import { useArcade } from "@/hooks/arcade";
 import { EditionModel, GameModel } from "@cartridge/arcade";
 import { useMarketplace } from "@/hooks/marketplace";
+import { useViewerAddress } from "@/hooks/viewer";
 
 export function Collection() {
   const { games, editions } = useArcade();
@@ -33,6 +34,7 @@ export function Collection() {
   const { project } = useConnection();
   const { collectionOrders: orders } = useMarketplace();
   const theme = useControllerTheme();
+  const { canPerformActions } = useViewerAddress();
 
   const edition: EditionModel | undefined = useMemo(() => {
     return Object.values(editions).find(
@@ -46,7 +48,9 @@ export function Collection() {
 
   const location = useLocation();
   const [searchParams] = useSearchParams();
-  const { collection, assets, status } = useCollection({ contractAddress });
+  const { collection, assets, status } = useCollection({
+    contractAddress,
+  });
 
   // Use local state for selection instead of URL parameters
   const [selectedTokenIds, setSelectedTokenIds] = useState<string[]>([]);
@@ -119,23 +123,25 @@ export function Collection() {
               certified
             />
 
-            <div
-              className={cn(
-                "flex items-center gap-x-1.5 text-xs cursor-pointer self-start text-foreground-300",
-              )}
-              onClick={handleSelectAll}
-            >
-              <CheckboxIcon
-                className={cn(selection && "text-foreground-100")}
-                variant={selection ? "minus-line" : "unchecked-line"}
-                size="sm"
-              />
-              <div>
-                {selection
-                  ? `${selectedTokenIds.length} Selected`
-                  : "Select all"}
+            {canPerformActions && (
+              <div
+                className={cn(
+                  "flex items-center gap-x-1.5 text-xs cursor-pointer self-start text-foreground-300",
+                )}
+                onClick={handleSelectAll}
+              >
+                <CheckboxIcon
+                  className={cn(selection && "text-foreground-100")}
+                  variant={selection ? "minus-line" : "unchecked-line"}
+                  size="sm"
+                />
+                <div>
+                  {selection
+                    ? `${selectedTokenIds.length} Selected`
+                    : "Select all"}
+                </div>
               </div>
-            </div>
+            )}
 
             <div className="grid grid-cols-2 gap-4 place-items-center">
               {assets.map((asset) => {
@@ -150,7 +156,7 @@ export function Collection() {
                     state={location.state}
                     key={asset.tokenId}
                     onClick={(e: React.MouseEvent<HTMLAnchorElement>) => {
-                      if (selection) {
+                      if (selection && canPerformActions) {
                         e.preventDefault();
                         handleSelect(asset.tokenId);
                       }
@@ -165,10 +171,12 @@ export function Collection() {
                           : `${asset.name} #${parseInt(BigInt(asset.tokenId).toString())}`
                       }
                       image={asset.imageUrl || placeholder}
-                      selectable
+                      selectable={canPerformActions}
                       selected={isSelected}
                       listingCount={listingCount}
-                      onSelect={() => handleSelect(asset.tokenId)}
+                      onSelect={() =>
+                        canPerformActions && handleSelect(asset.tokenId)
+                      }
                       className="rounded overflow-hidden"
                     />
                   </Link>
@@ -177,40 +185,42 @@ export function Collection() {
             </div>
           </LayoutContent>
 
-          <LayoutFooter
-            className={cn(
-              "relative flex flex-col items-center justify-center gap-y-4 bg-background",
-              !selection && "hidden",
-            )}
-          >
-            <div className="flex gap-3 w-full">
-              <Link
-                className={cn(
-                  "flex items-center justify-center gap-x-4 w-full",
-                  !allUnlisted && "pointer-events-none",
-                )}
-                to={allUnlisted ? `list?${createNavigationParams()}` : ""}
-              >
-                <Button
-                  variant="secondary"
-                  className={cn("w-full gap-2")}
-                  disabled={!allUnlisted}
+          {canPerformActions && (
+            <LayoutFooter
+              className={cn(
+                "relative flex flex-col items-center justify-center gap-y-4 bg-background",
+                !selection && "hidden",
+              )}
+            >
+              <div className="flex gap-3 w-full">
+                <Link
+                  className={cn(
+                    "flex items-center justify-center gap-x-4 w-full",
+                    !allUnlisted && "pointer-events-none",
+                  )}
+                  to={allUnlisted ? `list?${createNavigationParams()}` : ""}
                 >
-                  <TagIcon variant="solid" size="sm" />
-                  List
-                </Button>
-              </Link>
-              <Link
-                className="flex items-center justify-center gap-x-4 w-full"
-                to={`send?${createNavigationParams()}`}
-              >
-                <Button variant="secondary" className="w-full gap-2">
-                  <PaperPlaneIcon variant="solid" size="sm" />
-                  Send
-                </Button>
-              </Link>
-            </div>
-          </LayoutFooter>
+                  <Button
+                    variant="secondary"
+                    className={cn("w-full gap-2")}
+                    disabled={!allUnlisted}
+                  >
+                    <TagIcon variant="solid" size="sm" />
+                    List
+                  </Button>
+                </Link>
+                <Link
+                  className="flex items-center justify-center gap-x-4 w-full"
+                  to={`send?${createNavigationParams()}`}
+                >
+                  <Button variant="secondary" className="w-full gap-2">
+                    <PaperPlaneIcon variant="solid" size="sm" />
+                    Send
+                  </Button>
+                </Link>
+              </div>
+            </LayoutFooter>
+          )}
         </>
       )}
     </>
diff --git a/packages/keychain/src/components/inventory/token/token.tsx b/packages/keychain/src/components/inventory/token/token.tsx
index d05498eda1..07f6e3b3d5 100644
--- a/packages/keychain/src/components/inventory/token/token.tsx
+++ b/packages/keychain/src/components/inventory/token/token.tsx
@@ -22,6 +22,7 @@ import { useCallback, useMemo } from "react";
 import { useConnection } from "@/hooks/connection";
 import { useVersion } from "@/hooks/version";
 import { useNavigation } from "@/context/navigation";
+import { useViewerAddress } from "@/hooks/viewer";
 
 export function Token() {
   const { address } = useParams<{ address: string }>();
@@ -38,6 +39,7 @@ function Credits() {
   // TODO: Get parent from keychain connection if needed
   const { navigate } = useNavigation();
   const account = useAccount();
+  const { canPerformActions } = useViewerAddress();
   const username = account?.username || "";
   const credit = useCreditBalance({
     username,
@@ -70,15 +72,17 @@ function Credits() {
         </div>
       </LayoutContent>
 
-      <LayoutFooter className="gap-4">
-        <Button
-          onClick={() => {
-            navigate("/funding/credits");
-          }}
-        >
-          Purchase
-        </Button>
-      </LayoutFooter>
+      {canPerformActions && (
+        <LayoutFooter className="gap-4">
+          <Button
+            onClick={() => {
+              navigate("/funding/credits");
+            }}
+          >
+            Purchase
+          </Button>
+        </LayoutFooter>
+      )}
     </>
   );
 }
@@ -112,15 +116,17 @@ const CreditsLoadingState = () => {
 
 function ERC20() {
   const { address } = useParams<{ address: string }>();
-  const account = useAccount();
-  const accountAddress = account?.address || "";
+  const { address: profileAddress, canPerformActions } = useViewerAddress();
+  const accountAddress = profileAddress || "";
   const { controller } = useConnection();
   const explorer = useExplorer();
   const { transfers } = useData();
   const { isControllerGte } = useVersion();
 
   const chainId = constants.StarknetChainId.SN_MAIN; // Use mainnet as default
-  const { token } = useToken({ tokenAddress: address! });
+  const { token } = useToken({
+    tokenAddress: address!,
+  });
   const [searchParams] = useSearchParams();
 
   const compatibility = useMemo(() => {
@@ -225,7 +231,7 @@ function ERC20() {
         </div>
       </LayoutContent>
 
-      {compatibility && controller && (
+      {compatibility && controller && canPerformActions && (
         <LayoutFooter>
           <Link to={`send?${searchParams.toString()}`} className="w-full">
             <Button className="w-full space-x-2">
diff --git a/packages/keychain/src/components/inventory/token/tokens.tsx b/packages/keychain/src/components/inventory/token/tokens.tsx
index 4f689d15e5..93d3a4629e 100644
--- a/packages/keychain/src/components/inventory/token/tokens.tsx
+++ b/packages/keychain/src/components/inventory/token/tokens.tsx
@@ -66,6 +66,7 @@ export function Tokens() {
 
 function TokenCardContent({ token }: { token: Token }) {
   const [searchParams] = useSearchParams();
+
   return (
     <Link to={`./token/${token.metadata.address}?${searchParams.toString()}`}>
       <TokenCard
diff --git a/packages/keychain/src/hooks/account.ts b/packages/keychain/src/hooks/account.ts
index 7bf0c64657..9273eb2672 100644
--- a/packages/keychain/src/hooks/account.ts
+++ b/packages/keychain/src/hooks/account.ts
@@ -12,7 +12,7 @@ import {
 } from "@cartridge/ui/utils/api/cartridge";
 import base64url from "base64url";
 import { useEffect, useMemo, useState } from "react";
-import { useMatch, useSearchParams } from "react-router-dom";
+import { useMatch } from "react-router-dom";
 import { constants, getChecksumAddress } from "starknet";
 import { useConnection } from "./connection";
 import { useStarkAddress } from "./starknetid";
@@ -413,55 +413,50 @@ export type UseAccountResponse = {
   address: string;
 };
 
-export function useAccountProfile({
-  overridable,
-}: {
-  overridable?: boolean;
-} = {}): UseAccountResponse {
+export function useAccountProfile(): UseAccountResponse {
   // To be used in top level provider (Above Route component)
   // Ref: https://stackoverflow.com/a/75462921
   const match = useMatch("/account/:username/*");
-  const [searchParams] = useSearchParams();
 
-  const username = match?.params.username ?? "";
-  const { data: usernameData } = useAddressByUsernameQuery(
-    { username },
-    { enabled: !!username },
+  const usernameOrAddress = match?.params.username ?? "";
+
+  // Check if it's an address (starts with 0x) or username
+  const isAddress = useMemo(
+    () => usernameOrAddress.startsWith("0x"),
+    [usernameOrAddress],
   );
 
-  const address = useMemo(
-    () =>
-      (import.meta.env.VITE_MOCKED_ACCOUNT_ADDRESS as string) ??
-      usernameData?.account?.controllers.edges?.[0]?.node?.address ??
-      "",
-    [usernameData],
+  // If it's an address, use it directly; otherwise fetch it from username
+  const { data: usernameData } = useAddressByUsernameQuery(
+    { username: isAddress ? "" : usernameOrAddress },
+    { enabled: !isAddress && !!usernameOrAddress },
   );
 
-  const addressParam = searchParams.get("address");
+  // If it's an address, fetch the username for it
   const { data: addressData } = useAccountNameQuery(
-    { address: addressParam || "" },
-    {
-      enabled:
-        !!addressParam &&
-        addressParam.startsWith("0x") &&
-        !!addressParam.replace("0x", "").match(/^[0-9a-fA-F]+$/) &&
-        overridable,
-    },
+    { address: isAddress ? usernameOrAddress : "" },
+    { enabled: isAddress },
   );
-  const usernameParam = useMemo(() => {
-    if (
-      !addressParam ||
-      !addressParam.startsWith("0x") ||
-      !addressParam.replace("0x", "").match(/^[0-9a-fA-F]+$/)
-    )
-      return;
-    const username = addressData?.accounts?.edges?.[0]?.node?.username;
-    if (!username) return `0x${BigInt(addressParam).toString(16)}`.slice(0, 9);
-    return username;
-  }, [addressParam, addressData]);
+
+  const address = useMemo(() => {
+    if (import.meta.env.VITE_MOCKED_ACCOUNT_ADDRESS) {
+      return import.meta.env.VITE_MOCKED_ACCOUNT_ADDRESS as string;
+    }
+    if (isAddress) {
+      return usernameOrAddress;
+    }
+    return usernameData?.account?.controllers.edges?.[0]?.node?.address ?? "";
+  }, [isAddress, usernameOrAddress, usernameData]);
+
+  const username = useMemo(() => {
+    if (isAddress) {
+      return addressData?.accounts?.edges?.[0]?.node?.username ?? "";
+    }
+    return usernameOrAddress;
+  }, [isAddress, usernameOrAddress, addressData]);
 
   return {
-    username: overridable && usernameParam ? usernameParam : username,
-    address: overridable && addressParam ? addressParam : address,
+    username,
+    address,
   };
 }
diff --git a/packages/keychain/src/hooks/collectible.ts b/packages/keychain/src/hooks/collectible.ts
index 2209161d99..399eebb396 100644
--- a/packages/keychain/src/hooks/collectible.ts
+++ b/packages/keychain/src/hooks/collectible.ts
@@ -1,4 +1,4 @@
-import { useAccount, useAccountProfile } from "./account";
+import { useAccountProfile } from "./account";
 import { useEffect, useMemo, useState } from "react";
 import {
   useCollectibleQuery,
@@ -40,7 +40,7 @@ export function useCollectible({
   contractAddress?: string;
   tokenIds?: string[];
 }): UseCollectibleResponse {
-  const { address } = useAccountProfile({ overridable: true });
+  const { address } = useAccountProfile();
   const { project } = useConnection();
 
   const { data, status, refetch } = useCollectibleQuery(
@@ -145,8 +145,7 @@ export type CollectibleType = {
 };
 
 export function useCollectibles(): UseCollectiblesResponse {
-  const account = useAccount();
-  const address = account?.address;
+  const { address } = useAccountProfile();
   const { project } = useConnection();
   const [offset, setOffset] = useState(0);
   const [collectibles, setCollectibles] = useState<{
diff --git a/packages/keychain/src/hooks/collection.ts b/packages/keychain/src/hooks/collection.ts
index 167932344f..4de726b9e7 100644
--- a/packages/keychain/src/hooks/collection.ts
+++ b/packages/keychain/src/hooks/collection.ts
@@ -1,4 +1,4 @@
-import { useAccount, useAccountProfile } from "@/hooks/account";
+import { useAccountProfile } from "@/hooks/account";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Collections, Marketplace } from "@cartridge/marketplace";
 import { Token, ToriiClient } from "@dojoengine/torii-wasm";
@@ -118,7 +118,7 @@ export function useCollection({
   contractAddress?: string;
   tokenIds?: string[];
 }): UseCollectionResponse {
-  const { address } = useAccountProfile({ overridable: true });
+  const { address } = useAccountProfile();
   const { project } = useConnection();
 
   const [assets, setAssets] = useState<{ [key: string]: Asset }>({});
@@ -250,8 +250,7 @@ export type CollectionType = {
 };
 
 export function useCollections(): UseCollectionsResponse {
-  const account = useAccount();
-  const address = account?.address;
+  const { address } = useAccountProfile();
   const { project } = useConnection();
   const [collections, setCollections] = useState<{ [key: string]: Collection }>(
     {},
diff --git a/packages/keychain/src/hooks/token.ts b/packages/keychain/src/hooks/token.ts
index d7e8da6a66..d69a1982f0 100644
--- a/packages/keychain/src/hooks/token.ts
+++ b/packages/keychain/src/hooks/token.ts
@@ -9,7 +9,7 @@ import {
   useBalanceQuery,
   useBalancesQuery,
 } from "@cartridge/ui/utils/api/cartridge";
-import { useAccount } from "./account";
+import { useAccountProfile } from "./account";
 import { useConnection } from "@/hooks/connection";
 import { getChecksumAddress } from "starknet";
 import { useEffect, useMemo, useState } from "react";
@@ -69,8 +69,7 @@ export function useBalance({
 }: {
   tokenAddress?: string;
 }): UseBalanceResponse {
-  const account = useAccount();
-  const address = account?.address || "";
+  const { address } = useAccountProfile();
   const { project } = useConnection();
   const [token, setToken] = useState<Token | undefined>(undefined);
   const { status } = useBalanceQuery(
@@ -121,12 +120,11 @@ export type UseBalancesResponse = {
 };
 
 export function useBalances(accountAddress?: string): UseBalancesResponse {
-  const account = useAccount();
-  const connectedAddress = account?.address;
+  const { address: profileAddress } = useAccountProfile();
   const { project } = useConnection();
   const address = useMemo(
-    () => accountAddress ?? connectedAddress,
-    [accountAddress, connectedAddress],
+    () => accountAddress ?? profileAddress,
+    [accountAddress, profileAddress],
   );
 
   const projects = useMemo(() => {
@@ -187,11 +185,10 @@ export type UseTokensResponse = {
   status: "success" | "error" | "idle" | "loading";
 };
 
-export function useTokens(accountAddress?: string): UseTokensResponse {
+export function useTokens(): UseTokensResponse {
   const { tokens: options, controller } = useConnection();
   const provider = controller?.provider;
-  const account = useAccount();
-  const address = account?.address || "";
+  const { address } = useAccountProfile();
   const { project } = useConnection();
   const [contracts, setContracts] = useState<string[]>([]);
 
@@ -231,8 +228,7 @@ export function useTokens(accountAddress?: string): UseTokensResponse {
   }, [creditBalance]);
 
   // Get token data from torii
-  const { tokens: toriiTokens, status: toriiStatus } =
-    useBalances(accountAddress);
+  const { tokens: toriiTokens, status: toriiStatus } = useBalances(address);
 
   // Get token data from rpc (based on url options without those fetched from torii)
   const contractAddresses = useMemo(() => {
@@ -246,7 +242,7 @@ export function useTokens(accountAddress?: string): UseTokensResponse {
   }, [options, toriiTokens, contracts]);
 
   const { data: rpcData }: UseERC20BalanceResponse = useERC20Balance({
-    address: accountAddress ?? address,
+    address: address,
     contractAddress: contractAddresses,
     provider,
     interval: 30000,
@@ -355,12 +351,10 @@ export type UseTokenResponse = UseBalanceResponse;
 
 export function useToken({
   tokenAddress,
-  accountAddress,
 }: {
-  accountAddress?: string;
   tokenAddress: string;
 }): UseTokenResponse {
-  const { tokens, status } = useTokens(accountAddress);
+  const { tokens, status } = useTokens();
   return {
     token: tokens.find(
       (token) =>
diff --git a/packages/keychain/src/hooks/viewer.ts b/packages/keychain/src/hooks/viewer.ts
new file mode 100644
index 0000000000..d055029515
--- /dev/null
+++ b/packages/keychain/src/hooks/viewer.ts
@@ -0,0 +1,35 @@
+import { useMemo } from "react";
+import { useAccount, useAccountProfile } from "./account";
+
+export type UseViewerAddressResponse = {
+  address: string | undefined;
+  isOwner: boolean;
+  canPerformActions: boolean;
+};
+
+/**
+ * Hook to get the viewer address for inventory/collectibles
+ * Always uses the address from the URL path for viewing
+ * Actions are only available when viewing your own connected account
+ */
+export function useViewerAddress(): UseViewerAddressResponse {
+  const profileAccount = useAccountProfile(); // Always from URL path
+  const connectedAccount = useAccount(); // Connected controller if any
+
+  const viewerAddress = profileAccount.address;
+
+  const isOwner = useMemo(() => {
+    if (!viewerAddress || !connectedAccount?.address) return false;
+    return connectedAccount.address === viewerAddress;
+  }, [connectedAccount?.address, viewerAddress]);
+
+  const canPerformActions = useMemo(() => {
+    return isOwner && !!connectedAccount;
+  }, [isOwner, connectedAccount]);
+
+  return {
+    address: viewerAddress,
+    isOwner,
+    canPerformActions,
+  };
+}