diff --git a/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.ts b/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.ts
index d780d28..406f03f 100644
--- a/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.ts
+++ b/projects/lib/portal-options/services/crd-gateway-kcp-patch-resolver.service.ts
@@ -35,7 +35,7 @@ export class CrdGatewayKcpPatchResolver {
     const kcpPath = `${kcpRootOrgsPath}:${org}${entityKcpPath}`;
     this.gatewayService.updateCrdGatewayUrlWithEntityPath(kcpPath);
 
-    if (!nextNode.context.kcpPath) {
+    if (nextNode.context && !nextNode.context.kcpPath) {
       nextNode.context.kcpPath = kcpPath;
     }
     return kcpPath;
diff --git a/projects/lib/portal-options/services/custom-global-nodes.service.ts b/projects/lib/portal-options/services/custom-global-nodes.service.ts
index 8e55b55..08773d3 100644
--- a/projects/lib/portal-options/services/custom-global-nodes.service.ts
+++ b/projects/lib/portal-options/services/custom-global-nodes.service.ts
@@ -67,7 +67,9 @@ export class CustomGlobalNodesServiceImpl implements CustomGlobalNodesService {
             defineEntity: {
               id: 'user',
             },
-            context: {} as PortalNodeContext,
+            context: {
+              userId: ':userId',
+            } as PortalNodeContext,
             children: [
               {
                 pathSegment: 'overview',
diff --git a/projects/lib/services/resource/resource.service.ts b/projects/lib/services/resource/resource.service.ts
index fdf49f3..a19657a 100644
--- a/projects/lib/services/resource/resource.service.ts
+++ b/projects/lib/services/resource/resource.service.ts
@@ -15,8 +15,8 @@ import {
 } from '@platform-mesh/portal-ui-lib/utils';
 import { gql } from 'apollo-angular';
 import * as gqlBuilder from 'gql-query-builder';
-import { EMPTY, Observable } from 'rxjs';
 import VariableOptions from 'gql-query-builder/build/VariableOptions';
+import { EMPTY, Observable } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 interface ResourceResponseError extends Record<string, any> {