diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19ec9cc31..bb22d11aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the sorting to be case-insensitive in the account selector component
 - Removed the deprecated `permissions` attribute of the access in favor of the scopes
 
 ## 3.55.0 - 2026-08-19
diff --git a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
index cd4a0436e..2872a4648 100644
--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
@@ -20,7 +20,7 @@ import {
 } from '@prisma/client';
 import { isISIN } from 'class-validator';
 import YahooFinance from 'yahoo-finance2';
-import type { Price } from 'yahoo-finance2/esm/src/modules/quoteSummary-iface';
+import type { Price } from 'yahoo-finance2/modules/quoteSummary-iface';
 
 @Injectable()
 export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
diff --git a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
index 9f113b9e5..9b0366168 100644
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
@@ -25,20 +25,17 @@ import { addDays, format, isSameDay } from 'date-fns';
 import { ReasonPhrases, StatusCodes } from 'http-status-codes';
 import { uniqBy } from 'lodash';
 import YahooFinance from 'yahoo-finance2';
-import { ChartResultArray } from 'yahoo-finance2/esm/src/modules/chart';
-import {
+import type { ChartResultArray } from 'yahoo-finance2/modules/chart';
+import type {
   HistoricalDividendsResult,
   HistoricalHistoryResult
-} from 'yahoo-finance2/esm/src/modules/historical';
-import {
-  Quote,
-  QuoteResponseArray
-} from 'yahoo-finance2/esm/src/modules/quote';
-import {
+} from 'yahoo-finance2/modules/historical';
+import type { Quote, QuoteResponseArray } from 'yahoo-finance2/modules/quote';
+import type {
   Price,
   QuoteSummaryResult
-} from 'yahoo-finance2/esm/src/modules/quoteSummary';
-import { SearchQuoteNonYahoo } from 'yahoo-finance2/esm/src/modules/search';
+} from 'yahoo-finance2/modules/quoteSummary';
+import type { SearchQuoteNonYahoo } from 'yahoo-finance2/modules/search';
 
 @Injectable()
 export class YahooFinanceService implements DataProviderInterface {
diff --git a/apps/api/tsconfig.app.json b/apps/api/tsconfig.app.json
index 27aa457f1..8624cf568 100644
--- a/apps/api/tsconfig.app.json
+++ b/apps/api/tsconfig.app.json
@@ -4,10 +4,8 @@
     "outDir": "../../dist/out-tsc",
     "types": ["node"],
     "emitDecoratorMetadata": true,
-    "ignoreDeprecations": "6.0",
-    "moduleResolution": "node10",
     "target": "es2021",
-    "module": "commonjs"
+    "module": "preserve"
   },
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
diff --git a/apps/api/tsconfig.spec.json b/apps/api/tsconfig.spec.json
index 934e28503..e5f982722 100644
--- a/apps/api/tsconfig.spec.json
+++ b/apps/api/tsconfig.spec.json
@@ -2,8 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "moduleResolution": "node10",
+    "module": "preserve",
     "types": ["jest", "node"]
   },
   "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
diff --git a/libs/ui/src/lib/account-selector/account-selector.component.html b/libs/ui/src/lib/account-selector/account-selector.component.html
index 3fd21e58a..0ba679706 100644
--- a/libs/ui/src/lib/account-selector/account-selector.component.html
+++ b/libs/ui/src/lib/account-selector/account-selector.component.html
@@ -28,7 +28,7 @@
       <mat-option [value]="null" />
     }
 
-    @for (account of accounts(); track account.id) {
+    @for (account of sortedAccounts(); track account.id) {
       <mat-option [value]="account.id">
         <div class="d-flex">
           <gf-entity-logo
diff --git a/libs/ui/src/lib/account-selector/account-selector.component.ts b/libs/ui/src/lib/account-selector/account-selector.component.ts
index 819abbf92..06c179108 100644
--- a/libs/ui/src/lib/account-selector/account-selector.component.ts
+++ b/libs/ui/src/lib/account-selector/account-selector.component.ts
@@ -61,6 +61,14 @@ export class GfAccountSelectorComponent
     });
   });
 
+  public readonly sortedAccounts = computed(() => {
+    return [...this.accounts()].sort((a, b) => {
+      return (a.name ?? '')
+        .toLowerCase()
+        .localeCompare((b.name ?? '').toLowerCase());
+    });
+  });
+
   private readonly ngControl = inject(NgControl, {
     optional: true,
     self: true