diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java
index 0eec654..650fb05 100644
--- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java
+++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java
@@ -376,7 +376,7 @@ public class StatisticsPanel extends Composite {
 								Button quotaStorageValue = new Button();
 								quotaStorageValue.setType(ButtonType.LINK);
 								quotaStorageValue.setText(decimalFormat + "%");
-								quotaStorageValue.setTitle("You are currently using " + NumberFormat.getFormat("#.##").format(current) + "MB out of " + max + "MB in the Infrastructure Storage");
+								quotaStorageValue.setTitle("Currently using " + NumberFormat.getFormat("#.##").format(current) + "MB of " + max + "MB assigned in the Infrastructure Storage");
 								storage.appendToPanel(quotaStorageValue);
 							}
 
diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java
index b2a8bc8..20bf00f 100644
--- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java
+++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java
@@ -85,23 +85,20 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U
 		if(quotaServiceBaseUrl != null){
 
 			userName = ServerUtils.getCurrentUser(this.getThreadLocalRequest()).getUsername();
-
-			// do not show quota info to other users
+			quotaOfUser = userName;
+			
+			// check the user's quota to be shown
 			if(userid != null && !userid.equals(userName))
 				quotaOfUser = userid;
 
-			quotaOfUser = userName;
 			logger.debug("Fetching info for quota of user " + quotaOfUser);
 
 			try{
 
 				UserInfrastructureQuotaStorageCache cache = UserInfrastructureQuotaStorageCache.getCacheInstance();
-
 				if(cache.get(quotaOfUser) != null)
 					toReturn = cache.get(quotaOfUser);
 				else{
-
-					// ask the service ...
 					PortalContext pContext = PortalContext.getConfiguration();
 					String rootContextToken = pContext.getCurrentUserToken("/" + pContext.getInfrastructureName(), quotaOfUser);
 					URL request = new URL(quotaServiceBaseUrl + "?timeinterval=FOREVER&gcube-token=" + rootContextToken);