diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts
index 63e778de5..1d62f5f13 100644
--- a/apps/client/src/app/app-routing.module.ts
+++ b/apps/client/src/app/app-routing.module.ts
@@ -99,13 +99,6 @@ const routes: Routes = [
     loadChildren: () =>
       import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
   },
-  {
-    path: paths.public,
-    loadChildren: () =>
-      import('./pages/public/public-page.module').then(
-        (m) => m.PublicPageModule
-      )
-  },
   {
     path: paths.portfolio,
     loadChildren: () =>
@@ -120,6 +113,13 @@ const routes: Routes = [
         (m) => m.PricingPageModule
       )
   },
+  {
+    path: paths.public,
+    loadChildren: () =>
+      import('./pages/public/public-page.module').then(
+        (m) => m.PublicPageModule
+      )
+  },
   {
     path: paths.register,
     loadChildren: () =>
diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts
index 34c5fbda2..e70b6684a 100644
--- a/apps/client/src/app/components/access-table/access-table.component.ts
+++ b/apps/client/src/app/components/access-table/access-table.component.ts
@@ -2,6 +2,7 @@ import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/con
 import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
 import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
 import { Access, User } from '@ghostfolio/common/interfaces';
+import { paths } from '@ghostfolio/common/paths';
 
 import { Clipboard } from '@angular/cdk/clipboard';
 import {
@@ -55,7 +56,7 @@ export class AccessTableComponent implements OnChanges {
   public getPublicUrl(aId: string): string {
     const languageCode = this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE;
 
-    return `${this.baseUrl}/${languageCode}/p/${aId}`;
+    return `${this.baseUrl}/${languageCode}/${paths.public}/${aId}`;
   }
 
   public onCopyUrlToClipboard(aId: string): void {
diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts
index 72b17d858..16851b4e0 100644
--- a/apps/client/src/app/core/auth.guard.ts
+++ b/apps/client/src/app/core/auth.guard.ts
@@ -22,8 +22,8 @@ export class AuthGuard {
     `/${paths.features}`,
     `/${paths.markets}`,
     `/${paths.open}`,
-    `/${paths.public}`,
     `/${paths.pricing}`,
+    `/${paths.public}`,
     `/${paths.register}`,
     `/${paths.resources}`
   ];