diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java
index 568adc01e664766cdc98bf8ef420ed7b382d10f8..0637607ec4b7afa615dc7238c590d037e85e6747 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java
@@ -65,10 +65,10 @@ class CommandPut extends AbstractCommand
 
         private final IDssServiceRpcGeneric dssService;
 
-        CommandPutExecutor(IDssServiceRpcGeneric dataSet, CommandPutArguments arguments)
+        CommandPutExecutor(IDssServiceRpcGeneric dssService, CommandPutArguments arguments)
         {
             this.arguments = arguments;
-            this.dssService = dataSet;
+            this.dssService = dssService;
         }
 
         int execute()
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java
index 61dbaf648bcf3bd652d548cf200d5c11be5ace48..ea3cc23dd303728f9505f03df038dede9af92f3b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java
@@ -157,7 +157,6 @@ public class DssClient
         }
 
         String commandName = args[0];
-        System.out.println("Command " + commandName);
         ICommand command = commandFactory.tryCommandForName(commandName);
         if (null == command)
         {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index 9022a921646c77a041de0cc0a350b2646b1b4342..76ed7de5587cf835a0427d7305be9c40fd83a537 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -342,8 +342,8 @@ class AuthenticatedState extends AbstractDssComponentState
     @Override
     public IDssServiceRpcGeneric getDefaultDssService()
     {
-        
-        return null;
+        String url = service.getDefaultDataStoreBaseURL(sessionToken);
+        return getDssServiceForUrl(url);
     }
 
     /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 54a1188815a87f1a0eeff7652ea5aae1c7818eda..a5005f3f2f1e2474c1f2703e1dbcad292b88d119 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.generic.server;
 
+import static ch.systemsx.cisd.openbis.generic.shared.GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -679,6 +681,21 @@ public class ETLService extends AbstractCommonServer<IETLService> implements IET
 
     public String getDefaultDataStoreBaseURL(String sessionToken)
     {
-        return getDataStoreBaseURL();
+        String url = getDataStoreBaseURL();
+        // Strip the web application name from the URL
+        if (url.endsWith("/" + DATA_STORE_SERVER_WEB_APPLICATION_NAME))
+        {
+            url =
+                    url.substring(0, url.length()
+                            - (DATA_STORE_SERVER_WEB_APPLICATION_NAME.length() + 1));
+        }
+        // Strip "/data_store" from the URL as well
+        final String dataStoreString = "/data_store";
+        if (url.endsWith(dataStoreString))
+        {
+            url = url.substring(0, url.length() - dataStoreString.length());
+        }
+
+        return url;
     }
 }