diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
index eced8e5..459e121 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
@@ -699,7 +699,11 @@ public class CommonServiceUtils {
 	public static String evaluateOrganization(String organization, Sources sourceInPath) {
 		if(sourceInPath.equals(Sources.GRSF) && 
 				(organization.compareTo(Constants.GRSF_ADMIN_ORGANIZATION_NAME)==0 || organization.compareTo(Constants.GRSF_PRE_ORGANIZATION_NAME)==0)){
-			return Constants.GRSF_ADMIN_ORGANIZATION_NAME;
+			if(organization.compareTo(Constants.GRSF_ADMIN_ORGANIZATION_NAME)==0) {
+				return Constants.GRSF_ADMIN_ORGANIZATION_NAME;
+			}else {
+				return Constants.GRSF_PRE_ORGANIZATION_NAME;
+			}
 		}else
 			return sourceInPath.getOrigName().toLowerCase();
 	}