diff --git a/apps/api/app/api/v1/users/username/[username]/route.ts b/apps/api/app/api/v1/users/username/[username]/route.ts
index 88158fcd..ff6019a8 100644
--- a/apps/api/app/api/v1/users/username/[username]/route.ts
+++ b/apps/api/app/api/v1/users/username/[username]/route.ts
@@ -17,8 +17,6 @@ export async function GET(
 
     return NextResponse.json({ data: user })
   } catch (error) {
-    console.log(error) // eslint-disable-line no-console -- Log error for debugging
-
     if (error instanceof UserNotFoundError) {
       return NextResponse.json({ error: error.message }, { status: 404 })
     }
diff --git a/packages/lists/components/ListMarketRow.tsx b/packages/lists/components/ListMarketRow.tsx
index e0e4f834..fc03fca1 100644
--- a/packages/lists/components/ListMarketRow.tsx
+++ b/packages/lists/components/ListMarketRow.tsx
@@ -101,7 +101,7 @@ export function ListMarketRow({
 
       <ResolveMarketDialog
         market={market}
-        open={isResolving === market.id}
+        open={isResolving === market.id && canResolve}
         onClose={() => setResolving(undefined)}
         onSuccess={onRevalidate}
       />
diff --git a/packages/lists/components/ListPage.tsx b/packages/lists/components/ListPage.tsx
index 9a67156f..af59cd74 100644
--- a/packages/lists/components/ListPage.tsx
+++ b/packages/lists/components/ListPage.tsx
@@ -39,6 +39,8 @@ export function ListPage({
   const { selected, setSelected } = useSelectedItems()
   const [isAddMore, setIsAddMore] = useSearchParam('addMore')
   const [isEditing, setIsEditing] = useSearchParam('edit')
+  const canEdit = user ? canModifyList({ list, user }) : false
+  const canAddMore = user ? canAddToList({ list, userId: user.id }) : false
 
   const handleRevalidateBalance = async () => {
     void onRevalidate?.()
@@ -48,11 +50,7 @@ export function ListPage({
 
   return (
     <Card className="flex-1">
-      <ListToolbar
-        list={list}
-        canEdit={user ? canModifyList({ list, user }) : false}
-        onInitiateEdit={() => setIsEditing('true')}
-      />
+      <ListToolbar list={list} canEdit={canEdit} onInitiateEdit={() => setIsEditing('true')} />
 
       <CardHeader className="pt-0 md:pt-0">
         <CardTitle className="leading-relaxed">{list.title}</CardTitle>
@@ -110,7 +108,7 @@ export function ListPage({
           </Card>
         ) : null}
 
-        {canAddToList({ list, userId: user?.id }) ? (
+        {canAddMore ? (
           <div className="flex justify-end">
             <Button variant="ghost" className="text-muted-foreground" size="sm" onClick={() => setIsAddMore('true')}>
               <PlusIcon className="h-4 w-4" /> Add more
@@ -147,14 +145,14 @@ export function ListPage({
       <EditListDialog
         key={list.updatedAt.toString()} // reset form when list updates
         list={list}
-        open={isEditing === 'true'}
+        open={isEditing === 'true' && canEdit}
         onClose={() => setIsEditing(undefined)}
         onSuccess={onRevalidate}
       />
 
       <AddMoreListDialog
         list={list}
-        open={isAddMore != null}
+        open={isAddMore != null && canAddMore}
         onClose={() => setIsAddMore(undefined)}
         onSuccess={onRevalidate}
       />
diff --git a/packages/markets/components/MarketOverviewPage.tsx b/packages/markets/components/MarketOverviewPage.tsx
index 0593d4a8..abe1d8aa 100644
--- a/packages/markets/components/MarketOverviewPage.tsx
+++ b/packages/markets/components/MarketOverviewPage.tsx
@@ -28,7 +28,7 @@ import { UserLink } from '@play-money/users/components/UserLink'
 import { useUser } from '@play-money/users/context/UserContext'
 import { useSelectedItems } from '../../ui/src/contexts/SelectedItemContext'
 import { useSearchParam } from '../../ui/src/hooks/useSearchParam'
-import { canModifyMarket, isMarketClosed } from '../rules'
+import { canModifyMarket, isMarketClosed, isMarketTradable } from '../rules'
 import { ExtendedMarket } from '../types'
 import { EditMarketDialog } from './EditMarketDialog'
 import { EditMarketOptionDialog } from './EditMarketOptionDialog'
@@ -68,6 +68,8 @@ export function MarketOverviewPage({
   const [, setResolving] = useSearchParam('resolve')
   const isCreator = user?.id === market.createdBy
   const probabilities = marketOptionBalancesToProbabilities(balance?.amm)
+  const canEdit = user ? canModifyMarket({ market, user }) : false
+  const canTrade = isMarketTradable({ market })
 
   const mostLikelyOption = market.options.reduce((prev, current) =>
     (prev.probability || 0) > (current.probability || 0) ? prev : current
@@ -111,7 +113,7 @@ export function MarketOverviewPage({
       <Card className="flex-1">
         <MarketToolbar
           market={market}
-          canEdit={user ? canModifyMarket({ market, user }) : false}
+          canEdit={canEdit}
           onInitiateEdit={() => setIsEditing('true')}
           onInitiateBoost={() => setIsBoosting('true')}
           onRevalidate={handleRevalidateBalance}
@@ -279,20 +281,20 @@ export function MarketOverviewPage({
         <EditMarketDialog
           key={market.updatedAt.toString()} // reset form when market updates
           market={market}
-          open={isEditing === 'true'}
+          open={isEditing === 'true' && canEdit}
           onClose={() => setIsEditing(undefined)}
           onSuccess={onRevalidate}
         />
         <EditMarketOptionDialog
           market={market}
           optionId={isEditOption!}
-          open={isEditOption != null}
+          open={isEditOption != null && canEdit}
           onClose={() => setIsEditOption(undefined)}
           onSuccess={onRevalidate}
         />
         <LiquidityBoostDialog
           market={market}
-          open={isBoosting === 'true'}
+          open={isBoosting === 'true' && canTrade}
           onClose={() => setIsBoosting(undefined)}
           onSuccess={handleRevalidateBalance}
         />
diff --git a/packages/markets/components/MarketSellForm.tsx b/packages/markets/components/MarketSellForm.tsx
index 4756ccf2..546b1da8 100644
--- a/packages/markets/components/MarketSellForm.tsx
+++ b/packages/markets/components/MarketSellForm.tsx
@@ -104,7 +104,7 @@ export function MarketSellForm({
 
   const proportionateCost =
     (form.getValues('amount') * (selectedPosition?.cost || 0)) / (selectedPosition?.quantity || 0)
-  const disabled = !selectedPosition || new Decimal(selectedPosition.quantity).toDecimalPlaces(4).lt(0)
+  const disabled = !selectedPosition || new Decimal(selectedPosition.quantity).toDecimalPlaces(4).lte(0)
   const orderedOptions = _.orderBy(options, 'createdAt')
 
   return (
diff --git a/packages/markets/components/MarketToolbar.tsx b/packages/markets/components/MarketToolbar.tsx
index 505ec5a3..64ca1a23 100644
--- a/packages/markets/components/MarketToolbar.tsx
+++ b/packages/markets/components/MarketToolbar.tsx
@@ -162,14 +162,14 @@ export function MarketToolbar({
 
       <ResolveMarketDialog
         market={market}
-        open={isResolving === 'true'}
+        open={isResolving === 'true' && canResolve}
         onClose={() => setResolving(undefined)}
         onSuccess={onRevalidate}
       />
 
       <CancelMarketDialog
         market={market}
-        open={isCanceling === 'true'}
+        open={isCanceling === 'true' && canCancel}
         onClose={() => setCanceling(undefined)}
         onSuccess={onRevalidate}
       />
diff --git a/packages/markets/lib/createMarketSellTransaction.ts b/packages/markets/lib/createMarketSellTransaction.ts
index 4c6ae24f..6a369cef 100644
--- a/packages/markets/lib/createMarketSellTransaction.ts
+++ b/packages/markets/lib/createMarketSellTransaction.ts
@@ -1,5 +1,6 @@
 import Decimal from 'decimal.js'
 import { executeTransaction } from '@play-money/finance/lib/executeTransaction'
+import { findBalanceChange } from '@play-money/finance/lib/helpers'
 import { executeTrade } from './executeTrade'
 import { updateMarketBalances } from './updateMarketBalances'
 import { updateMarketOptionProbabilities } from './updateMarketOptionProbabilities'
@@ -36,6 +37,12 @@ export async function createMarketSellTransaction({
     additionalLogic: async (txParams) => {
       // Create or update the position before we value it
       await updateMarketPosition({ ...txParams, marketId, accountId, optionId })
+      const primaryChange = findBalanceChange({
+        balanceChanges: txParams.balanceChanges,
+        accountId,
+        assetType: 'CURRENCY',
+        assetId: 'PRIMARY',
+      })!
 
       const [balances] = await Promise.all([
         updateMarketBalances({ ...txParams, marketId }),
@@ -47,7 +54,7 @@ export async function createMarketSellTransaction({
           },
           data: {
             liquidityCount: {
-              decrement: amount.toNumber(),
+              decrement: primaryChange.change,
             },
             updatedAt: new Date(),
           },
diff --git a/packages/users/components/UserProfileLayout.tsx b/packages/users/components/UserProfileLayout.tsx
index 87c30368..e8881488 100644
--- a/packages/users/components/UserProfileLayout.tsx
+++ b/packages/users/components/UserProfileLayout.tsx
@@ -1,4 +1,5 @@
 import { format } from 'date-fns'
+import { redirect } from 'next/navigation'
 import React from 'react'
 import { getUserBalance, getUserStats, getUserUsername } from '@play-money/api-helpers/client'
 import { CurrencyDisplay } from '@play-money/finance/components/CurrencyDisplay'
@@ -49,84 +50,85 @@ export async function UserProfileLayout({
   params: { username: string }
   children: React.ReactNode
 }) {
-  const { data: profile } = await getUserUsername({ username })
-  const { data: stats } = await getUserStats({ userId: profile.id })
-  const {
-    data: { balance },
-  } = await getUserBalance({ userId: profile.id })
+  try {
+    const { data: profile } = await getUserUsername({ username })
+    const { data: stats } = await getUserStats({ userId: profile.id })
+    const {
+      data: { balance },
+    } = await getUserBalance({ userId: profile.id })
 
-  const quester =
-    balance.subtotals['DAILY_TRADE_BONUS'] +
-    balance.subtotals['DAILY_MARKET_BONUS'] +
-    balance.subtotals['DAILY_COMMENT_BONUS'] +
-    balance.subtotals['DAILY_LIQUIDITY_BONUS']
-  const creator = balance.subtotals['CREATOR_TRADER_BONUS']
-  const trader = Math.abs(balance.subtotals['TRADE_BUY'])
-  const promoter = Math.abs(balance.subtotals['LIQUIDITY_DEPOSIT'])
-  const referrer = balance.subtotals['REFERRER_BONUS']
+    const quester =
+      balance.subtotals['DAILY_TRADE_BONUS'] +
+      balance.subtotals['DAILY_MARKET_BONUS'] +
+      balance.subtotals['DAILY_COMMENT_BONUS'] +
+      balance.subtotals['DAILY_LIQUIDITY_BONUS']
+    const creator = balance.subtotals['CREATOR_TRADER_BONUS']
+    const trader = Math.abs(balance.subtotals['TRADE_BUY'])
+    const promoter = Math.abs(balance.subtotals['LIQUIDITY_DEPOSIT'])
+    const referrer = balance.subtotals['REFERRER_BONUS']
 
-  const playstyleData = [
-    { subject: 'Quester', value: getOrdersOfMagnitude(quester) / 4, color: '#a0d8e7' },
-    { subject: 'Creator', value: getOrdersOfMagnitude(creator) / 4, color: '#ffc638' },
-    { subject: 'Trader', value: getOrdersOfMagnitude(trader) / 4, color: '#00cdb1' },
-    { subject: 'Promoter', value: getOrdersOfMagnitude(promoter) / 4, color: '#8247ff' },
-    { subject: 'Referrer', value: getOrdersOfMagnitude(referrer) / 4, color: '#2563eb' },
-  ]
+    const playstyleData = [
+      { subject: 'Quester', value: getOrdersOfMagnitude(quester) / 4, color: '#a0d8e7' },
+      { subject: 'Creator', value: getOrdersOfMagnitude(creator) / 4, color: '#ffc638' },
+      { subject: 'Trader', value: getOrdersOfMagnitude(trader) / 4, color: '#00cdb1' },
+      { subject: 'Promoter', value: getOrdersOfMagnitude(promoter) / 4, color: '#8247ff' },
+      { subject: 'Referrer', value: getOrdersOfMagnitude(referrer) / 4, color: '#2563eb' },
+    ]
 
-  return (
-    <main className="mx-auto flex flex-1 flex-col items-start gap-6 md:flex-row">
-      <div className="w-full space-y-4 md:w-80">
-        <Card>
-          <CardHeader className="flex flex-row items-start gap-4 bg-muted/50">
-            <UserAvatar user={profile} size="lg" />
-            <div>
-              <CardTitle className="text-lg">{profile.displayName}</CardTitle>
-              <CardDescription>@{profile.username}</CardDescription>
-            </div>
-            {/* <div className="ml-auto flex items-center gap-1">
+    return (
+      <main className="mx-auto flex flex-1 flex-col items-start gap-6 md:flex-row">
+        <div className="w-full space-y-4 md:w-80">
+          <Card>
+            <CardHeader className="flex flex-row items-start gap-4 bg-muted/50">
+              <UserAvatar user={profile} size="lg" />
+              <div>
+                <CardTitle className="text-lg">{profile.displayName}</CardTitle>
+                <CardDescription>@{profile.username}</CardDescription>
+              </div>
+              {/* <div className="ml-auto flex items-center gap-1">
             <EditOrFollowUserButton userId={profile.id} />
           </div> */}
-          </CardHeader>
-          <CardContent className="pt-3 text-sm md:pt-6">
-            <div className="grid gap-3">
-              {profile.bio ? <div>{profile.bio}</div> : null}
-              {profile.twitterHandle || profile.discordHandle || profile.website ? (
-                <div className="flex min-w-0 flex-row gap-4">
-                  {profile.twitterHandle ? (
-                    <a
-                      href={`https://twitter.com/${profile.twitterHandle}`}
-                      target="_blank"
-                      className="flex min-w-0 items-center gap-2 text-muted-foreground hover:text-foreground hover:underline"
-                    >
-                      <TwitterIcon className="h-4 w-4" />
-                      <span className="truncate">{profile.twitterHandle}</span>
-                    </a>
-                  ) : null}
+            </CardHeader>
+            <CardContent className="pt-3 text-sm md:pt-6">
+              <div className="grid gap-3">
+                {profile.bio ? <div>{profile.bio}</div> : null}
+                {profile.twitterHandle || profile.discordHandle || profile.website ? (
+                  <div className="flex min-w-0 flex-row gap-4">
+                    {profile.twitterHandle ? (
+                      <a
+                        href={`https://twitter.com/${profile.twitterHandle}`}
+                        target="_blank"
+                        className="flex min-w-0 items-center gap-2 text-muted-foreground hover:text-foreground hover:underline"
+                      >
+                        <TwitterIcon className="h-4 w-4" />
+                        <span className="truncate">{profile.twitterHandle}</span>
+                      </a>
+                    ) : null}
 
-                  {profile.discordHandle ? (
-                    <a
-                      href={`https://discordapp.com/users/${profile.discordHandle}`}
-                      target="_blank"
-                      className="flex min-w-0 items-center gap-2 text-muted-foreground hover:text-foreground hover:underline"
-                    >
-                      <DiscordIcon className="h-4 w-4" />
-                      <span className="truncate">{profile.discordHandle}</span>
-                    </a>
-                  ) : null}
+                    {profile.discordHandle ? (
+                      <a
+                        href={`https://discordapp.com/users/${profile.discordHandle}`}
+                        target="_blank"
+                        className="flex min-w-0 items-center gap-2 text-muted-foreground hover:text-foreground hover:underline"
+                      >
+                        <DiscordIcon className="h-4 w-4" />
+                        <span className="truncate">{profile.discordHandle}</span>
+                      </a>
+                    ) : null}
 
-                  {profile.website ? (
-                    <a
-                      href={profile.website}
-                      target="_blank"
-                      className="flex min-w-0 items-center gap-2 text-muted-foreground hover:text-foreground hover:underline"
-                    >
-                      <DiscordIcon className="h-4 w-4" />
-                      <span className="truncate">{profile.website}</span>
-                    </a>
-                  ) : null}
-                </div>
-              ) : null}
-              {/* <div className="flex flex-row gap-4">
+                    {profile.website ? (
+                      <a
+                        href={profile.website}
+                        target="_blank"
+                        className="flex min-w-0 items-center gap-2 text-muted-foreground hover:text-foreground hover:underline"
+                      >
+                        <DiscordIcon className="h-4 w-4" />
+                        <span className="truncate">{profile.website}</span>
+                      </a>
+                    ) : null}
+                  </div>
+                ) : null}
+                {/* <div className="flex flex-row gap-4">
               <Link
                 href={`/${profile.username}/followers`}
                 className="flex items-center gap-1 text-muted-foreground hover:text-foreground hover:underline"
@@ -142,60 +144,63 @@ export async function UserProfileLayout({
                 <span>Followers</span>
               </Link>
             </div> */}
-            </div>
+              </div>
 
-            <Separator className="my-4" />
+              <Separator className="my-4" />
 
-            <div className="grid grid-cols-2 gap-4">
-              <div className="text-center">
-                <div className="font-semibold">
-                  <CurrencyDisplay value={stats.netWorth + stats.otherIncome} isShort />
+              <div className="grid grid-cols-2 gap-4">
+                <div className="text-center">
+                  <div className="font-semibold">
+                    <CurrencyDisplay value={stats.netWorth + stats.otherIncome} isShort />
+                  </div>
+                  <div className="text-muted-foreground">Net worth</div>
+                </div>
+                <div className="text-center">
+                  <div className="font-mono font-semibold">{formatNumber(stats.tradingVolume)}</div>
+                  <div className="text-muted-foreground">Trading volume</div>
+                </div>
+                <div className="text-center">
+                  <div className="font-semibold">{stats.totalMarkets}</div>
+                  <div className="text-muted-foreground">Total markets</div>
+                </div>
+                <div className="text-center">
+                  <div className="font-semibold">
+                    {stats.lastTradeAt ? (
+                      <time dateTime={stats.lastTradeAt.toString()}>{format(stats.lastTradeAt, 'MMM d, yyyy')}</time>
+                    ) : (
+                      '-'
+                    )}
+                  </div>
+                  <div className="text-muted-foreground">Last traded</div>
                 </div>
-                <div className="text-muted-foreground">Net worth</div>
-              </div>
-              <div className="text-center">
-                <div className="font-mono font-semibold">{formatNumber(stats.tradingVolume)}</div>
-                <div className="text-muted-foreground">Trading volume</div>
               </div>
-              <div className="text-center">
-                <div className="font-semibold">{stats.totalMarkets}</div>
-                <div className="text-muted-foreground">Total markets</div>
+            </CardContent>
+            <CardFooter className="flex flex-row items-center border-t bg-muted/50 py-3 md:py-3">
+              <div className="text-xs text-muted-foreground">
+                Joined <time dateTime={profile.createdAt.toString()}>{format(profile.createdAt, 'MMM d, yyyy')}</time> —{' '}
+                {stats.activeDayCount} day{stats.activeDayCount > 1 ? 's' : ''} active
               </div>
-              <div className="text-center">
-                <div className="font-semibold">
-                  {stats.lastTradeAt ? (
-                    <time dateTime={stats.lastTradeAt.toString()}>{format(stats.lastTradeAt, 'MMM d, yyyy')}</time>
-                  ) : (
-                    '-'
-                  )}
+            </CardFooter>
+          </Card>
+
+          <Card className="relative p-4">
+            <div className="absolute z-10 text-lg font-semibold text-muted-foreground">Playstyle</div>
+            <UserPlaystyleChart data={playstyleData} />
+            <div className="flex flex-wrap justify-center gap-x-3 border-t pt-1">
+              {playstyleData.map(({ subject, value, color }) => (
+                <div key={subject} className="flex items-center gap-1">
+                  <div className="h-2 w-2 rounded-md" style={{ backgroundColor: color }} />
+                  <div className="font-mono text-xs text-muted-foreground">{subject}</div>
                 </div>
-                <div className="text-muted-foreground">Last traded</div>
-              </div>
-            </div>
-          </CardContent>
-          <CardFooter className="flex flex-row items-center border-t bg-muted/50 py-3 md:py-3">
-            <div className="text-xs text-muted-foreground">
-              Joined <time dateTime={profile.createdAt.toString()}>{format(profile.createdAt, 'MMM d, yyyy')}</time> —{' '}
-              {stats.activeDayCount} day{stats.activeDayCount > 1 ? 's' : ''} active
+              ))}
             </div>
-          </CardFooter>
-        </Card>
+          </Card>
+        </div>
 
-        <Card className="relative p-4">
-          <div className="absolute z-10 text-lg font-semibold text-muted-foreground">Playstyle</div>
-          <UserPlaystyleChart data={playstyleData} />
-          <div className="flex flex-wrap justify-center gap-x-3 border-t pt-1">
-            {playstyleData.map(({ subject, value, color }) => (
-              <div key={subject} className="flex items-center gap-1">
-                <div className="h-2 w-2 rounded-md" style={{ backgroundColor: color }} />
-                <div className="font-mono text-xs text-muted-foreground">{subject}</div>
-              </div>
-            ))}
-          </div>
-        </Card>
-      </div>
-
-      <div className="w-full flex-1">{children}</div>
-    </main>
-  )
+        <div className="w-full flex-1">{children}</div>
+      </main>
+    )
+  } catch (error) {
+    redirect('/')
+  }
 }
diff --git a/packages/users/components/UserProfilePage.tsx b/packages/users/components/UserProfilePage.tsx
index 6ef7daf8..758a3869 100644
--- a/packages/users/components/UserProfilePage.tsx
+++ b/packages/users/components/UserProfilePage.tsx
@@ -2,6 +2,7 @@ import { format } from 'date-fns'
 import Decimal from 'decimal.js'
 import _ from 'lodash'
 import Link from 'next/link'
+import { redirect } from 'next/navigation'
 import React from 'react'
 import {
   getMarketPositions,
@@ -225,127 +226,133 @@ export async function UserProfilePage({
     sortDirection?: 'asc' | 'desc'
   }
 }) {
-  const { data: user } = await getUserUsername({ username })
-  const { data: positions } = await getUserPositions({ userId: user.id, limit: 5 })
-  const { data: markets } = await getUserMarkets({ userId: user.id })
+  try {
+    const { data: user } = await getUserUsername({ username })
+    const { data: positions } = await getUserPositions({ userId: user.id, limit: 5 })
+    const { data: markets } = await getUserMarkets({ userId: user.id })
 
-  return (
-    <div className="flex flex-col gap-4">
-      <UserGraph userId={user.id} />
+    return (
+      <div className="flex flex-col gap-4">
+        <UserGraph userId={user.id} />
 
-      <UserProfileTabs>
-        <div className="flex items-center">
-          <TabsList>
-            <TabsTrigger value="overview">Overview</TabsTrigger>
-            <TabsTrigger value="trades">Trades</TabsTrigger>
-            <TabsTrigger value="markets">Questions</TabsTrigger>
-            <TabsTrigger value="lists">Lists</TabsTrigger>
-            <TabsTrigger value="positions">Positions</TabsTrigger>
-          </TabsList>
-        </div>
-        <TabsContent value="overview">
-          <div className="flex flex-col gap-4 md:flex-row">
-            <Card className="flex-1">
-              <CardContent>
-                <div className="my-4 text-lg font-semibold">Recent Positions</div>
-                <div className="divide-y border-t">
-                  {positions.length ? (
-                    positions.map((position) => {
-                      const value = new Decimal(position.value).toDecimalPlaces(4)
-                      const cost = new Decimal(position.cost).toDecimalPlaces(4)
-                      const change = value.sub(cost).div(cost).times(100).round().toNumber()
-                      const changeLabel = `(${change > 0 ? '+' : ''}${change}%)`
+        <UserProfileTabs>
+          <div className="flex items-center">
+            <TabsList>
+              <TabsTrigger value="overview">Overview</TabsTrigger>
+              <TabsTrigger value="trades">Trades</TabsTrigger>
+              <TabsTrigger value="markets">Questions</TabsTrigger>
+              <TabsTrigger value="lists">Lists</TabsTrigger>
+              <TabsTrigger value="positions">Positions</TabsTrigger>
+            </TabsList>
+          </div>
+          <TabsContent value="overview">
+            <div className="flex flex-col gap-4 md:flex-row">
+              <Card className="flex-1">
+                <CardContent>
+                  <div className="my-4 text-lg font-semibold">Recent Positions</div>
+                  <div className="divide-y border-t">
+                    {positions.length ? (
+                      positions.map((position) => {
+                        const value = new Decimal(position.value).toDecimalPlaces(4)
+                        const cost = new Decimal(position.cost).toDecimalPlaces(4)
+                        const change = value.sub(cost).div(cost).times(100).round().toNumber()
+                        const changeLabel = `(${change > 0 ? '+' : ''}${change}%)`
 
-                      return (
-                        <Link
-                          href={`/questions/${position.market.id}/${position.market.slug}`}
-                          legacyBehavior
-                          key={position.id}
-                          className="cursor-pointer"
-                        >
-                          <div className="cursor-pointer py-2">
-                            <div className="line-clamp-2 text-sm">
-                              <span className="font-semibold">
-                                <CurrencyDisplay value={Number(position.value)} />{' '}
-                                {change ? (
-                                  <span className={change > 0 ? 'text-lime-500' : 'text-red-400'}>{changeLabel}</span>
-                                ) : null}
-                              </span>{' '}
-                              {position.option.name}
+                        return (
+                          <Link
+                            href={`/questions/${position.market.id}/${position.market.slug}`}
+                            legacyBehavior
+                            key={position.id}
+                            className="cursor-pointer"
+                          >
+                            <div className="cursor-pointer py-2">
+                              <div className="line-clamp-2 text-sm">
+                                <span className="font-semibold">
+                                  <CurrencyDisplay value={Number(position.value)} />{' '}
+                                  {change ? (
+                                    <span className={change > 0 ? 'text-lime-500' : 'text-red-400'}>{changeLabel}</span>
+                                  ) : null}
+                                </span>{' '}
+                                {position.option.name}
+                              </div>
+                              <div className="line-clamp-1 text-sm text-muted-foreground">
+                                {position.market.question}
+                              </div>
                             </div>
-                            <div className="line-clamp-1 text-sm text-muted-foreground">{position.market.question}</div>
-                          </div>
-                        </Link>
-                      )
-                    })
-                  ) : (
-                    <div className="mt-4 text-center text-muted-foreground">No positions yet</div>
-                  )}
-                </div>
+                          </Link>
+                        )
+                      })
+                    ) : (
+                      <div className="mt-4 text-center text-muted-foreground">No positions yet</div>
+                    )}
+                  </div>
+                </CardContent>
+              </Card>
+              <Card className="flex-1">
+                <CardContent>
+                  <div className="my-4 text-lg font-semibold">Recent Questions</div>
+                  <div className="divide-y border-t">
+                    {markets.length ? (
+                      markets.slice(0, 5).map((market) => {
+                        return (
+                          <Link
+                            href={`/questions/${market.id}/${market.slug}`}
+                            legacyBehavior
+                            key={market.id}
+                            className="cursor-pointer"
+                          >
+                            <div className="cursor-pointer py-2">
+                              <div className="line-clamp-2 text-sm">{market.question}</div>
+                              <div className="line-clamp-1 text-sm text-muted-foreground">
+                                <MarketProbabilityDetail options={market.options} size="sm" />
+                              </div>
+                            </div>
+                          </Link>
+                        )
+                      })
+                    ) : (
+                      <div className="mt-4 text-center text-muted-foreground">No questions yet</div>
+                    )}
+                  </div>
+                </CardContent>
+              </Card>
+            </div>
+          </TabsContent>
+          <TabsContent value="trades">
+            <Card>
+              <CardContent>
+                <UserTradesTable userId={user.id} />
               </CardContent>
             </Card>
-            <Card className="flex-1">
+          </TabsContent>
+
+          <TabsContent value="markets">
+            <Card>
               <CardContent>
-                <div className="my-4 text-lg font-semibold">Recent Questions</div>
-                <div className="divide-y border-t">
-                  {markets.length ? (
-                    markets.slice(0, 5).map((market) => {
-                      return (
-                        <Link
-                          href={`/questions/${market.id}/${market.slug}`}
-                          legacyBehavior
-                          key={market.id}
-                          className="cursor-pointer"
-                        >
-                          <div className="cursor-pointer py-2">
-                            <div className="line-clamp-2 text-sm">{market.question}</div>
-                            <div className="line-clamp-1 text-sm text-muted-foreground">
-                              <MarketProbabilityDetail options={market.options} size="sm" />
-                            </div>
-                          </div>
-                        </Link>
-                      )
-                    })
-                  ) : (
-                    <div className="mt-4 text-center text-muted-foreground">No questions yet</div>
-                  )}
-                </div>
+                <UserMarketsTable userId={user.id} />
               </CardContent>
             </Card>
-          </div>
-        </TabsContent>
-        <TabsContent value="trades">
-          <Card>
-            <CardContent>
-              <UserTradesTable userId={user.id} />
-            </CardContent>
-          </Card>
-        </TabsContent>
-
-        <TabsContent value="markets">
-          <Card>
-            <CardContent>
-              <UserMarketsTable userId={user.id} />
-            </CardContent>
-          </Card>
-        </TabsContent>
+          </TabsContent>
 
-        <TabsContent value="lists">
-          <Card>
-            <CardContent>
-              <UserListsTable userId={user.id} />
-            </CardContent>
-          </Card>
-        </TabsContent>
+          <TabsContent value="lists">
+            <Card>
+              <CardContent>
+                <UserListsTable userId={user.id} />
+              </CardContent>
+            </Card>
+          </TabsContent>
 
-        <TabsContent value="positions">
-          <Card>
-            <CardContent>
-              <UserPositionsTab userId={user.id} filters={filters} />
-            </CardContent>
-          </Card>
-        </TabsContent>
-      </UserProfileTabs>
-    </div>
-  )
+          <TabsContent value="positions">
+            <Card>
+              <CardContent>
+                <UserPositionsTab userId={user.id} filters={filters} />
+              </CardContent>
+            </Card>
+          </TabsContent>
+        </UserProfileTabs>
+      </div>
+    )
+  } catch (error) {
+    redirect('/')
+  }
 }
diff --git a/packages/users/lib/updateUserById.ts b/packages/users/lib/updateUserById.ts
index 92e6b7c9..6789ebf6 100644
--- a/packages/users/lib/updateUserById.ts
+++ b/packages/users/lib/updateUserById.ts
@@ -44,7 +44,12 @@ export async function updateUserById({
     updatedData.displayName = displayName
   }
   if (referredBy && !user.referredBy) {
-    updatedData.referredBy = referredBy
+    try {
+      const user = await getUserById({ id: referredBy })
+      if (user) {
+        updatedData.referredBy = referredBy
+      }
+    } catch (_error) {}
   }
 
   const updatedUser = await db.user.update({