diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
index 128c5cf..39fe098 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
@@ -9,6 +9,7 @@ import java.util.Map;
 import org.gcube.portlets.user.workspace.client.resources.Resources;
 import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingEntryType;
 import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField;
+import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
 
 import com.extjs.gxt.ui.client.Style.ButtonScale;
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
@@ -341,8 +342,14 @@ public class AccoutingInfoContainer extends LayoutContainer {
 				hashOperation.put(gxtAccountingField.getOperation().getId(), "");
 //				typeStoreOperation.add(type((gxtAccountingField.getOperation().getId())));
 			}
-
-			baseModel.set(USER, gxtAccountingField.getUser().getName());
+			
+			InfoContactModel user = gxtAccountingField.getUser();
+			
+			if(user!=null)
+				baseModel.set(USER, user.getName());
+			else
+				baseModel.set(USER, "");
+			
 			baseModel.set(DATE, gxtAccountingField.getDate());
 
 			listModelData.add(baseModel);
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
index 7a86609..c4be0d8 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java
@@ -1441,7 +1441,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			workspaceLogger.error("Renaming item error:", e);
 			StringBuilder error = new StringBuilder();
 			if(sourceItemIsShared) {
-				error.append("Ops! This operation is not allowed, we're working hard to make this possible soon.");
+				error.append("Renaming shared folders is not supported");
 				throw new SHUBOperationNotAllowedException(error.toString());
 			}else {
 				error.append("Ops an error occurred renaming the item! Either you have not the permission to rename it or a server error occurred. Please, refresh and try again");
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
index 448b352..0df5efb 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/tostoragehub/StorageHubToWorkpaceConverter.java
@@ -689,13 +689,13 @@ public class StorageHubToWorkpaceConverter implements Serializable{
 						//see Task #19544
 						if(shubAccEntry.getUser().equalsIgnoreCase("ALL")) {
 							//CASE ALL
-							msg+= "is no longer shared";
+							msg= "The folder is no longer shared with others";
 							user = new InfoContactModel(theUser, "n.a.", "n.a.", null, false);
 						}else {
 							msg+= "is no longer shared with "+user.getName();
 							user = new InfoContactModel(theUser, "Owner / Admin", "Owner / Admin", null, false);
 						}
-						
+						af.setUser(user);
 						af.setDescription(msg);
 					}
 					break;