diff --git a/analytics-webapps/src/main/java/io/meeds/analytics/portlet/AbstractAnalyticsPortlet.java b/analytics-webapps/src/main/java/io/meeds/analytics/portlet/AbstractAnalyticsPortlet.java
index 9765a0034..4504b3f1f 100644
--- a/analytics-webapps/src/main/java/io/meeds/analytics/portlet/AbstractAnalyticsPortlet.java
+++ b/analytics-webapps/src/main/java/io/meeds/analytics/portlet/AbstractAnalyticsPortlet.java
@@ -218,7 +218,7 @@ protected SearchScope getSearchScope(PortletRequest request) { // NOSONAR
 
     Space space = SpaceUtils.getSpaceByContext();
     if (space != null) {
-      if (getSpaceService().isSuperManager(userId) || getSpaceService().isMember(space, userId)) {
+      if (getSpaceService().canViewSpace(space, userId)) {
         return cacheSearchScope(portletSession, SearchScope.SPACE);
       } else {
         return cacheSearchScope(portletSession, SearchScope.NONE);
@@ -256,7 +256,7 @@ protected boolean canModifySettings(PortletRequest request) {
     }
     Space space = SpaceUtils.getSpaceByContext();
     if (space != null) {
-      boolean canModify = getSpaceService().isSuperManager(userId) || getSpaceService().isManager(space, userId);
+      boolean canModify = getSpaceService().canManageSpace(space, userId);
       return cacheChartModificationAccessPermission(portletSession, canModify);
     }
     return cacheChartModificationAccessPermission(portletSession, false);