diff --git a/src/app/app.component.html b/src/app/app.component.html
index fba1e15..94a30ff 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -24,7 +24,7 @@
     <router-outlet></router-outlet>
     <bottom *ngIf="isFrontPage" [darkBackground]="false"
             [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
-    <role-verification *ngIf="stakeholder && properties.environment === 'development'"
+    <role-verification *ngIf="stakeholder"
                        [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type"></role-verification>
   </div>
 </div>
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index de2485e..df80751 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -197,7 +197,8 @@
             </ng-template>
           </div>
         </div>
-        <div *ngIf="!loading && !privateStakeholder && (activeSubCategory || activeTopic.categories == null || activeTopic.categories.length == 0)"
+        <div *ngIf="!loading && !privateStakeholder && (activeSubCategory || (activeTopic &&
+        (activeTopic.categories == null || activeTopic.categories.length == 0)))"
              class="uk-width-1-1 uk-text-center uk-text-muted">
           <span>Send us your <a [href]="mailText" target="_self" (click)="mailMe()">feedback</a>.</span>
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 3179ced..024724c 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -51,14 +51,9 @@ export let properties: EnvProperties = {
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "80",
   registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login",
+  loginUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
   userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
-  logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
-  /*registryUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/",
-  loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
-  userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
-  /!*logoutUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_logout",*!/
-  logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/
+  logoutUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_logout',
   cookieDomain: ".di.uoa.gr",
   feedbackmail: "openaire.test@gmail.com",
   cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",