diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
index 678bb61..e039af1 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
@@ -94,8 +94,8 @@ public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNo
 		formPanel.setEncoding(FormPanel.ENCODING_MULTIPART);
 		formPanel.setMethod(FormPanel.METHOD_POST);
 		formPanel.setWidth("auto");
-		
-		
+
+
 		// Create a panel to hold all of the form widgets.
 		panel = new VerticalPanel();
 		formPanel.setWidget(panel);
@@ -105,6 +105,7 @@ public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNo
 
 		// Add hidden parameters
 		panel.add(new Hidden(ConstantsWorkspaceUploader.CURR_GROUP_ID, GCubeClientContext.getCurrentContextId()));
+		panel.add(new Hidden(ConstantsWorkspaceUploader.CURR_USER_ID, GCubeClientContext.getCurrentUserId()));
 		panel.add(new Hidden(ConstantsWorkspaceUploader.ID_FOLDER,parentId));
 		panel.add(new Hidden(ConstantsWorkspaceUploader.UPLOAD_TYPE,uploadType.toString()));
 
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
index a5957bc..8884d6d 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
@@ -252,7 +252,7 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 				if (item.isFormField() && CURR_USER_ID.equals(item.getFieldName())){
 					currUserId = Streams.asString(item.openStream());
 					logger.debug("currUserId passed as parameter = " + currUserId);
-					logger.debug("currUserId into PortalContext scope= " + PortalContext.getConfiguration().getCurrentUser(request));
+					logger.debug("currUserinto PortalContext = " + PortalContext.getConfiguration().getCurrentUser(request));
 				}
 
 				//MUST BE THE LAST PARAMETER TRASMITTED
@@ -513,6 +513,7 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 
 				if (MimeTypeUtil.isZipContentType(uploadItem.getContentType())){ //UNZIP??
 					logger.debug("Unziping content");
+					//THE WORKSPACE HAS BEEN INSTANCIED ABOVE
 					workspaceUploader = WorkspaceUploaderMng.uploadArchive(currUserId, scopeGroupId, workspaceUploader, request, itemName, inputStream, destinationFolder, size);
 
 					if(workspaceUploader==null)
@@ -520,6 +521,7 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 
 					sendMessage(response, workspaceUploader.getIdentifier());
 				} else{
+					//THE WORKSPACE HAS BEEN INSTANCIED ABOVE
 					workspaceUploader = WorkspaceUploaderMng.uploadFile(currUserId, scopeGroupId, request, workspaceUploader, request.getSession(), wa, itemName, inputStream, destinationFolder, contentType, isOverwrite, size);
 
 					if(workspaceUploader==null)
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/util/WsUtil.java
index 21bacca..2ddb13c 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/util/WsUtil.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/util/WsUtil.java
@@ -89,30 +89,6 @@ public class WsUtil {
 		return HomeLibrary.getUserWorkspace(username);
 	}
 
-
-//	/**
-//	 * Gets the workspace.
-//	 *
-//	 * @param username the username
-//	 * @param scopeGroupId the scope group id
-//	 * @param currUserId the curr user id
-//	 * @return the workspace
-//	 * @throws InternalErrorException the internal error exception
-//	 * @throws HomeNotFoundException the home not found exception
-//	 * @throws WorkspaceFolderNotFoundException the workspace folder not found exception
-//	 */
-//	public static Workspace getWorkspace(String username, String scopeGroupId, String currUserId) throws InternalErrorException, HomeNotFoundException, WorkspaceFolderNotFoundException{
-//
-//		logger.trace("Get Workspace for user = " + username);
-//		PortalContext pContext = PortalContext.getConfiguration();
-//		String scope = pContext.getCurrentScope(scopeGroupId);
-//		logger.trace("Client context scope: "+ scope + " username: "+username);
-//
-//		ScopeProvider.instance.set(scope);
-//		return HomeLibrary.getUserWorkspace(username);
-//	}
-
-
 	/**
 	 * Put workspace uploader in session.
 	 *