diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts
index 00a7548e0..5e1f68c87 100644
--- a/apps/client/src/app/app-routing.module.ts
+++ b/apps/client/src/app/app-routing.module.ts
@@ -100,7 +100,7 @@ const routes: Routes = [
       import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
   },
   {
-    path: paths.public,
+    path: paths.p,
     loadChildren: () =>
       import('./pages/public/public-page.module').then(
         (m) => m.PublicPageModule
diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts
index 7a75728ca..82b4f746f 100644
--- a/apps/client/src/app/core/auth.guard.ts
+++ b/apps/client/src/app/core/auth.guard.ts
@@ -17,13 +17,13 @@ import { paths } from './paths';
 export class AuthGuard {
   private static PUBLIC_PAGE_ROUTES = [
     `/${paths.about}`,
-    '/blog',
-    '/demo',
+    `/${paths.blog}`,
+    `/${paths.demo}`,
     `/${paths.faq}`,
     `/${paths.features}`,
     `/${paths.markets}`,
-    '/open',
-    '/p',
+    `/${paths.open}`,
+    `/${paths.p}`,
     `/${paths.pricing}`,
     `/${paths.register}`,
     `/${paths.resources}`
@@ -52,13 +52,13 @@ export class AuthGuard {
               this.router.navigate(['/demo']);
               resolve(false);
             } else if (utmSource === 'trusted-web-activity') {
-              this.router.navigate(['/' + $localize`register`]);
+              this.router.navigate(['/' + paths.register]);
               resolve(false);
             } else if (
-              AuthGuard.PUBLIC_PAGE_ROUTES.filter((publicPageRoute) => {
-                const [, url] = state.url.split('/');
+              AuthGuard.PUBLIC_PAGE_ROUTES.some((publicPageRoute) => {
+                const [, url] = decodeURIComponent(state.url).split('/');
                 return `/${url}` === publicPageRoute;
-              })?.length > 0
+              })
             ) {
               resolve(true);
               return EMPTY;
diff --git a/apps/client/src/app/core/paths.ts b/apps/client/src/app/core/paths.ts
index 4cca9521a..fbcc7386f 100644
--- a/apps/client/src/app/core/paths.ts
+++ b/apps/client/src/app/core/paths.ts
@@ -18,8 +18,8 @@ export const paths = {
   marketData: 'market-data',
   membership: 'membership',
   open: 'open',
+  p: 'p',
   portfolio: 'portfolio',
-  public: 'p',
   settings: 'settings',
   start: 'start',
   summary: 'summary',