diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
index 6075622..2b7bf6a 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
@@ -87,16 +87,19 @@ public class SDMXTableDetailCard extends WizardCard {
 		agencyName.setEmptyText("Enter Agency...");
 		agencyName.setValue(exportSession.getAgency().getName());
 		FieldLabel agencyNameLabel = new FieldLabel(agencyName, "Agency");
-		agencyNameLabel.setLabelSeparator("");
 		p.add(agencyNameLabel, new VerticalLayoutData(1, -1));
 
-		
 		registryBaseUrl = new TextField();
-		registryBaseUrl.setVisible(true);
+		registryBaseUrl.setVisible(false);
 		registryBaseUrl.setEmptyText("Enter Registry URL...");
-		registryBaseUrl.setValue(((SDMXRegistrySource)exportSession.getSource()).getUrl());
+		String urlRegistry=((SDMXRegistrySource)exportSession.getSource()).getUrl();
+		if(urlRegistry==null||urlRegistry.isEmpty()){
+			registryBaseUrl.setValue(null);
+		} else {
+			registryBaseUrl.setValue(urlRegistry);
+		}
 		FieldLabel registryBaseUrlLabel = new FieldLabel(registryBaseUrl, "Registry URL");
-		registryBaseUrlLabel.setLabelSeparator("");
+		registryBaseUrlLabel.setVisible(false);
 		p.add(registryBaseUrlLabel, new VerticalLayoutData(1, -1));
 		
 		version = new TextField();
@@ -157,8 +160,7 @@ public class SDMXTableDetailCard extends WizardCard {
 		};
 
 		if (id.getValue() == null || id.getValue().isEmpty()
-				|| !id.isValid() || registryBaseUrl.getValue() == null
-				|| registryBaseUrl.getValue().isEmpty() || !registryBaseUrl.isValid()
+				|| !id.isValid() 
 				|| version.getValue() == null || version.getValue().isEmpty()
 				|| !version.isValid() || agencyName.getValue() == null
 				|| agencyName.getValue().isEmpty() || !agencyName.isValid()) {