diff --git a/openbis_standard_technologies/dist/core-plugins/dropbox-monitor/2/dss/reporting-plugins/dropboxReporter/dropboxReportEntryPoint.py b/openbis_standard_technologies/dist/core-plugins/dropbox-monitor/2/dss/reporting-plugins/dropboxReporter/dropboxReportEntryPoint.py
index b1d6ca7c66ff0896e4ffb1e50d8b7d40a3a3c748..5efd8438e5f79b99f310626bfbbadc3471f1f346 100644
--- a/openbis_standard_technologies/dist/core-plugins/dropbox-monitor/2/dss/reporting-plugins/dropboxReporter/dropboxReportEntryPoint.py
+++ b/openbis_standard_technologies/dist/core-plugins/dropbox-monitor/2/dss/reporting-plugins/dropboxReporter/dropboxReportEntryPoint.py
@@ -22,7 +22,7 @@ def process(tr, parameters, tableBuilder):
     rootDirectory = getRootDir(tr)
     dropboxesList = listAllDropboxes()
 
-    logDirectory = getLogsDir(rootDirectory)
+    logDirectory = getLogsDir(tr)
 
     dropboxInProcess = os.listdir(os.path.join(logDirectory, "in-process"))
     dropboxFailed = os.listdir(os.path.join(logDirectory, "failed"))
@@ -55,8 +55,13 @@ def process(tr, parameters, tableBuilder):
         detailInfoBuilder.buildRow(detailInfoMap)
 
 
-def getLogsDir(rootDirectory):
-    return os.path.join(rootDirectory, "servers/datastore_server/log-registrations")
+def getLogsDir(tr):
+    defaultDir = System.getProperty("user.dir")
+    dir = getProperty(tr, "dss-registration-log-dir")
+    if dir is None:
+        return os.path.join(defaultDir, "log-registrations")
+    else:
+        return dir        
 
 
 def listAllDropboxes():