diff --git a/packages/desktop-client/src/components/modals/CreateAccount.tsx b/packages/desktop-client/src/components/modals/CreateAccount.tsx
index cef5940f0b9..757fe8c7054 100644
--- a/packages/desktop-client/src/components/modals/CreateAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CreateAccount.tsx
@@ -39,7 +39,7 @@ export function CreateAccount({
       return;
     }
 
-    if (upgradingAccountId === undefined) {
+    if (upgradingAccountId == null) {
       authorizeBank(actions.pushModal);
     } else {
       authorizeBank(actions.pushModal, {
@@ -71,9 +71,7 @@ export function CreateAccount({
       orgDomain: string;
     };
 
-    for (let i = 0; i < results.accounts.length; i++) {
-      const oldAccount = results.accounts[i];
-
+    for (const oldAccount of results.accounts) {
       const newAccount: NormalizedAccount = {
         account_id: oldAccount.id,
         name: oldAccount.name,
@@ -122,7 +120,7 @@ export function CreateAccount({
   const [loadingSimpleFinAccounts, setLoadingSimpleFinAccounts] =
     useState(false);
 
-  if (upgradingAccountId !== undefined) {
+  if (upgradingAccountId != null) {
     title = 'Link Account';
   }
 
@@ -130,7 +128,7 @@ export function CreateAccount({
     <Modal title={title} {...modalProps}>
       {() => (
         <View style={{ maxWidth: 500, gap: 30, color: theme.pageText }}>
-          {upgradingAccountId === undefined && (
+          {upgradingAccountId == null && (
             <View style={{ gap: 10 }}>
               <Button
                 type="primary"
diff --git a/packages/loot-core/src/client/state-types/modals.d.ts b/packages/loot-core/src/client/state-types/modals.d.ts
index ffa8c94e88b..e25e38feb32 100644
--- a/packages/loot-core/src/client/state-types/modals.d.ts
+++ b/packages/loot-core/src/client/state-types/modals.d.ts
@@ -39,7 +39,7 @@ type FinanceModals = {
     accounts: unknown[];
     requisitionId: string;
     upgradingAccountId?: string;
-    syncSource?: string;
+    syncSource?: AccountSyncSource;
   };
 
   'confirm-category-delete': { onDelete: () => void } & (
diff --git a/packages/loot-core/src/types/models/account.d.ts b/packages/loot-core/src/types/models/account.d.ts
index 6bc9ce4d460..cb668f6622f 100644
--- a/packages/loot-core/src/types/models/account.d.ts
+++ b/packages/loot-core/src/types/models/account.d.ts
@@ -15,4 +15,7 @@ type _SyncFields<T> = {
   balance_current: T extends true ? number : null;
   balance_available: T extends true ? number : null;
   balance_limit: T extends true ? number : null;
+  account_sync_source: T extends true ? AccountSyncSource : null;
 };
+
+export type AccountSyncSource = 'simpleFin' | 'goCardless';