diff --git a/business-registry-dashboard/app/middleware/02.auth.global.ts b/business-registry-dashboard/app/middleware/00.auth.global.ts
similarity index 100%
rename from business-registry-dashboard/app/middleware/02.auth.global.ts
rename to business-registry-dashboard/app/middleware/00.auth.global.ts
diff --git a/business-registry-dashboard/app/middleware/00.magic-link.global.ts b/business-registry-dashboard/app/middleware/00.magic-link.global.ts
deleted file mode 100644
index d58b84d..0000000
--- a/business-registry-dashboard/app/middleware/00.magic-link.global.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export default defineNuxtRouteMiddleware((to) => {
-  // Check if the route is an affiliation invitation link without locale prefix
-  if ((to.path.startsWith('/affiliationInvitation/acceptToken') || to.path.startsWith('/incorporateNow')) && !to.path.startsWith('/en-CA/')) {
-    // Convert query params to URLSearchParams to maintain all existing query parameters
-    const searchParams = new URLSearchParams(to.query as Record<string, string>)
-    const queryString = searchParams.toString()
-
-    // Construct the full URL with the en-CA locale prefix and existing query parameters
-    const newUrl = `/en-CA${to.path}${queryString ? '?' + queryString : ''}`
-    // Force a full page reload with the new URL to ensure proper locale handling
-    window.location.href = newUrl
-
-    // Prevent Nuxt from handling the navigation since we're doing a full page reload
-    return abortNavigation()
-  }
-})
diff --git a/business-registry-dashboard/app/middleware/01.account-link.global.ts b/business-registry-dashboard/app/middleware/01.account-link.global.ts
deleted file mode 100644
index 8951e2a..0000000
--- a/business-registry-dashboard/app/middleware/01.account-link.global.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export default defineNuxtRouteMiddleware((to) => {
-  // Check if the route is an account link without locale prefix
-  if (to.path.startsWith('/account')) {
-    // Construct the full URL with the en-CA locale prefix
-    const newUrl = `/en-CA${to.path}`
-    // Force a full page reload with the new URL to ensure proper locale handling
-    window.location.href = newUrl
-
-    // Prevent Nuxt from handling the navigation since we're doing a full page reload
-    return abortNavigation()
-  }
-})
diff --git a/business-registry-dashboard/app/pages/[...slug].vue b/business-registry-dashboard/app/pages/[...slug].vue
deleted file mode 100644
index 604f5d2..0000000
--- a/business-registry-dashboard/app/pages/[...slug].vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<script setup lang="ts">
-// This is a catch-all route that will handle any undefined routes
-// This will handle the intermittent page 404 not found until the middleware is loaded
-</script>
-
-<template>
-  <NuxtLayout name="dashboard">
-    <DashboardContent />
-  </NuxtLayout>
-</template>
diff --git a/business-registry-dashboard/app/pages/account/[orgId].vue b/business-registry-dashboard/app/pages/account/[orgId].vue
index 32ba408..535c499 100644
--- a/business-registry-dashboard/app/pages/account/[orgId].vue
+++ b/business-registry-dashboard/app/pages/account/[orgId].vue
@@ -1,3 +1,6 @@
+<script setup lang="ts">
+definePageMeta({ order: 0 })
+</script>
 <template>
   <NuxtLayout name="dashboard">
     <DashboardContent />
diff --git a/business-registry-dashboard/nuxt.config.ts b/business-registry-dashboard/nuxt.config.ts
index 1532536..e075888 100644
--- a/business-registry-dashboard/nuxt.config.ts
+++ b/business-registry-dashboard/nuxt.config.ts
@@ -14,7 +14,7 @@ export default defineNuxtConfig({
   },
 
   routeRules: {
-    '/': { redirect: '/en-CA' }
+    '/en-CA': { redirect: '/' }
   },
 
   modules: [
@@ -88,7 +88,7 @@ export default defineNuxtConfig({
         file: 'fr-CA.ts'
       }
     ],
-    strategy: 'prefix',
+    strategy: 'prefix_except_default',
     lazy: true,
     langDir: 'locales',
     defaultLocale: 'en-CA',
diff --git a/business-registry-dashboard/package.json b/business-registry-dashboard/package.json
index 704c8f9..ff871d9 100644
--- a/business-registry-dashboard/package.json
+++ b/business-registry-dashboard/package.json
@@ -2,7 +2,7 @@
   "name": "business-registry-dashboard",
   "private": true,
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",