diff --git a/src/app/(mobile-ui)/home/page.tsx b/src/app/(mobile-ui)/home/page.tsx
index 295bad12d..d7e5c956b 100644
--- a/src/app/(mobile-ui)/home/page.tsx
+++ b/src/app/(mobile-ui)/home/page.tsx
@@ -40,6 +40,7 @@ import { PEANUT_WALLET_TOKEN_DECIMALS } from '@/constants'
 import { PostSignupActionManager } from '@/components/Global/PostSignupActionManager'
 import { useWithdrawFlow } from '@/context/WithdrawFlowContext'
 import { useClaimBankFlow } from '@/context/ClaimBankFlowContext'
+import { useDeviceType, DeviceType } from '@/hooks/useGetDeviceType'
 
 const BALANCE_WARNING_THRESHOLD = parseInt(process.env.NEXT_PUBLIC_BALANCE_WARNING_THRESHOLD ?? '500')
 const BALANCE_WARNING_EXPIRY = parseInt(process.env.NEXT_PUBLIC_BALANCE_WARNING_EXPIRY ?? '1814400') // 21 days in seconds
@@ -50,6 +51,7 @@ export default function Home() {
     const [isRewardsModalOpen, setIsRewardsModalOpen] = useState(false)
     const { resetFlow: resetClaimBankFlow } = useClaimBankFlow()
     const { resetWithdrawFlow } = useWithdrawFlow()
+    const { deviceType } = useDeviceType()
     const [isBalanceHidden, setIsBalanceHidden] = useState(() => {
         const prefs = getUserPreferences()
         return prefs?.balanceHidden ?? false
@@ -89,6 +91,7 @@ export default function Home() {
     }, [resetClaimBankFlow, resetWithdrawFlow])
 
     useEffect(() => {
+        if (isFetchingUser) return
         // We have some users that didn't have the peanut wallet created
         // correctly, so we need to create it
         if (address && user && !user.accounts.some((a) => a.type === AccountType.PEANUT_WALLET)) {
@@ -98,7 +101,7 @@ export default function Home() {
                 userId: user.user.userId,
             })
         }
-    }, [user, address, addAccount])
+    }, [user, address, isFetchingUser])
 
     // always reset external wallet connection on home page
     useEffect(() => {
@@ -110,9 +113,7 @@ export default function Home() {
     // effect for showing iOS PWA Install modal
     useEffect(() => {
         if (typeof window !== 'undefined') {
-            const isIOS =
-                /iPad|iPhone|iPod/.test(navigator.userAgent) ||
-                (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)
+            const isIOS = deviceType === DeviceType.IOS
             const isStandalone = window.matchMedia('(display-mode: standalone)').matches
             const hasSeenModalThisSession = sessionStorage.getItem('hasSeenIOSPWAPromptThisSession')
             const redirectUrl = getFromLocalStorage('redirect')
@@ -131,7 +132,7 @@ export default function Home() {
                 setShowIOSPWAInstallModal(false)
             }
         }
-    }, [user?.hasPwaInstalled, isPostSignupActionModalVisible])
+    }, [user?.hasPwaInstalled, isPostSignupActionModalVisible, deviceType])
 
     // effect for showing balance warning modal
     useEffect(() => {
diff --git a/src/components/Setup/Views/SetupPasskey.tsx b/src/components/Setup/Views/SetupPasskey.tsx
index c58b28673..22dcc91a9 100644
--- a/src/components/Setup/Views/SetupPasskey.tsx
+++ b/src/components/Setup/Views/SetupPasskey.tsx
@@ -7,7 +7,7 @@ import { useAuth } from '@/context/authContext'
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import * as Sentry from '@sentry/nextjs'
-import { WalletProviderType } from '@/interfaces'
+import { WalletProviderType, AccountType } from '@/interfaces'
 import { WebAuthnError } from '@simplewebauthn/browser'
 import Link from 'next/link'
 import { getFromLocalStorage } from '@/utils'
@@ -18,12 +18,14 @@ const SetupPasskey = () => {
     const { username, telegramHandle } = useSetupStore()
     const { isLoading } = useSetupFlow()
     const { handleRegister, address } = useZeroDev()
-    const { user } = useAuth()
+    const { user, isFetchingUser } = useAuth()
     const { addAccount } = useAuth()
     const [error, setError] = useState<string | null>(null)
     const router = useRouter()
 
     useEffect(() => {
+        // Dont try to double add the account
+        if (isFetchingUser || user?.accounts.some((a) => a.type === AccountType.PEANUT_WALLET)) return
         if (address && user) {
             addAccount({
                 accountIdentifier: address,
@@ -57,15 +59,15 @@ const SetupPasskey = () => {
                     dispatch(setupActions.setLoading(false))
                 })
         }
-    }, [address, user])
+    }, [address, user, isFetchingUser])
 
     return (
         <div>
             <div className="flex h-full flex-col justify-between gap-11 p-0 md:min-h-32">
                 <div className="flex h-full flex-col justify-end gap-2 text-center">
                     <Button
-                        loading={isLoading}
-                        disabled={isLoading}
+                        loading={isLoading || isFetchingUser}
+                        disabled={isLoading || isFetchingUser}
                         onClick={async () => {
                             dispatch(setupActions.setLoading(true))
                             try {