diff --git a/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx b/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx
index 59966a46f..084d8daed 100644
--- a/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx
+++ b/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx
@@ -98,14 +98,9 @@ export default function OnrampBankPage() {
         if (step === 'loading') {
             const currentKycStatus = liveKycStatus || user?.user.kycStatus
             const isUserKycVerified = currentKycStatus === 'approved'
-            const hasUserDetails = user?.user.fullName && user?.user.email
 
             if (!isUserKycVerified) {
-                if (hasUserDetails) {
-                    setStep('kyc')
-                } else {
-                    setStep('collectUserDetails')
-                }
+                setStep('collectUserDetails')
             } else {
                 setStep('inputAmount')
                 if (amountFromContext && !rawTokenAmount) {
diff --git a/src/components/AddMoney/UserDetailsForm.tsx b/src/components/AddMoney/UserDetailsForm.tsx
index 033524bdc..a1ace78f3 100644
--- a/src/components/AddMoney/UserDetailsForm.tsx
+++ b/src/components/AddMoney/UserDetailsForm.tsx
@@ -54,7 +54,6 @@ export const UserDetailsForm = forwardRef<{ handleSubmit: () => void }, UserDeta
             rules: any,
             type: string = 'text'
         ) => {
-            const isDisabled = name === 'email' ? !!initialData?.email : !!initialData?.firstName // also check for lastname implicitly with firstname
             return (
                 <div className="w-full">
                     <div className="relative">
@@ -68,7 +67,6 @@ export const UserDetailsForm = forwardRef<{ handleSubmit: () => void }, UserDeta
                                     type={type}
                                     placeholder={placeholder}
                                     className="h-12 w-full rounded-sm border border-n-1 bg-white px-4 text-sm"
-                                    disabled={isDisabled}
                                 />
                             )}
                         />
diff --git a/src/components/Claim/Link/Initial.view.tsx b/src/components/Claim/Link/Initial.view.tsx
index 421815ff6..e109a27e9 100644
--- a/src/components/Claim/Link/Initial.view.tsx
+++ b/src/components/Claim/Link/Initial.view.tsx
@@ -300,8 +300,8 @@ export const InitialClaimLinkView = ({
                 })
                 if (user?.user.kycStatus === 'approved') {
                     const account = user.accounts.find(
-                        (account: any) =>
-                            account.account_identifier.replaceAll(/\s/g, '').toLowerCase() ===
+                        (account) =>
+                            account.identifier.replaceAll(/\s/g, '').toLowerCase() ===
                             recipient.address.replaceAll(/\s/g, '').toLowerCase()
                     )