diff --git a/src/EventHub.Admin.Web/wwwroot/appsettings.json b/src/EventHub.Admin.Web/wwwroot/appsettings.json
index 043dc32..cd414ea 100644
--- a/src/EventHub.Admin.Web/wwwroot/appsettings.json
+++ b/src/EventHub.Admin.Web/wwwroot/appsettings.json
@@ -9,7 +9,7 @@
   },
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "https://localhost:44305"
+      "BaseUrl": "https://localhost:44362"
     }
   },
   "AbpCli": {
diff --git a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
index be166b5..bea3856 100644
--- a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
+++ b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
@@ -176,7 +176,8 @@ namespace EventHub
                 {
                     builder
                         .WithOrigins(
-                            EventHubUrlOptions.GetWwwConfigValue(configuration)
+                            EventHubUrlOptions.GetWwwConfigValue(configuration),
+                            EventHubUrlOptions.GetAdminConfigValue(configuration)
                         )
                         .WithAbpExposedHeaders()
                         .SetIsOriginAllowedToAllowWildcardSubdomains()
diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
index 4b1b767..cd1fe03 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
@@ -155,20 +155,31 @@
                             }
                         </div>
                         <div class="tab-content">
-                            <div id="PastEvent" class="tab-pane active">
-                                @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
-                                {
-                                    organizationId = Model.Organization.Id,
-                                    maxDate = Clock.Now.ClearTime()
-                                })
-                            </div>
-                            <div id="UpcomingEvent" class="tab-pane">
-                                @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
-                                {
-                                    organizationId = Model.Organization.Id,
-                                    minDate = Clock.Now.ClearTime()
-                                })
-                            </div>
+                            @if (!Model.HasPastEvents && !Model.HasUpcomingEvents)
+                            {
+                                <p>There is no Event</p>
+                            }
+                            @if (Model.HasPastEvents)
+                            {
+                                <div id="PastEvent" class="tab-pane active">
+                                    @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
+                                    {
+                                        organizationId = Model.Organization.Id,
+                                        maxDate = Clock.Now.ClearTime()
+                                    })
+                                </div>
+                            }
+                            @if (Model.HasUpcomingEvents)
+                            {
+                                var isActive = Model.HasPastEvents ? "" : "active";
+                                <div id="UpcomingEvent" class="tab-pane @isActive">
+                                    @await Component.InvokeAsync(typeof(EventsAreaViewComponent), new
+                                    {
+                                        organizationId = Model.Organization.Id,
+                                        minDate = Clock.Now.ClearTime()
+                                    })
+                                </div>
+                            }
                         </div>
                     </div>
                     <div id="members-section" class="tab-pane fade">