diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ef485d0..3ccbbd8 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -315,7 +315,7 @@ export class AppComponent implements OnInit, OnDestroy {
     } else {
       this.properties.adminToolsPortalType = "connect";
       if (this.document) {
-        this.initLayout('connect');
+        this.initLayout(this.communityId?this.communityId:'connect');
       }
     }
     this.configurationService.initPortal(this.properties, (communityId) ? communityId : this.properties.adminToolsPortalType);
@@ -455,7 +455,7 @@ export class AppComponent implements OnInit, OnDestroy {
       }
       this.showMenu = true;
     } else {
-      this.communityId = null;
+      this.communityId = (this.community && ConnectHelper.isPrivate(this.community, this.user))?this.community.communityId:null;
       this.configurationService.initPortal(this.properties, "connect");
       this.buildConnectMenu(true);
       if (this.community && this.community.status == "manager") {