diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
index e5f75f1..a9f8fd2 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVWorkSpaceSelectionCard.java
@@ -24,6 +24,7 @@ import com.sencha.gxt.widget.core.client.event.HideEvent;
 import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
 import com.sencha.gxt.widget.core.client.form.FieldLabel;
 import com.sencha.gxt.widget.core.client.form.TextField;
+import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator;
 
 /**
  * 
@@ -62,17 +63,19 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
 		}
 
 		fileName = new TextField();
+		fileName.addValidator(new EmptyValidator<String>());
 		fileName.setAllowBlank(false);
 		fileName.setWidth("410px");
-		fileName.setValue(fileN+".csv");
-		p.add(new FieldLabel(fileName, "File Name"), new VerticalLayoutData(-1,
+		fileName.setValue(fileN);
+		p.add(new FieldLabel(fileName, "Name"), new VerticalLayoutData(-1,
 				-1));
 
 		fileDescription = new TextField();
 		fileDescription.setAllowBlank(false);
+		fileDescription.addValidator(new EmptyValidator<String>());
 		fileDescription.setWidth("410px");
 		fileDescription.setValue("csv");
-		p.add(new FieldLabel(fileDescription, "File Description"),
+		p.add(new FieldLabel(fileDescription, "Description"),
 				new VerticalLayoutData(-1, -1));
 
 		Log.debug("Set Workspace Panel");