diff --git a/core/src/core/src/pydio/Core/Services/ConfService.php b/core/src/core/src/pydio/Core/Services/ConfService.php
index 526030c673..b643d98729 100644
--- a/core/src/core/src/pydio/Core/Services/ConfService.php
+++ b/core/src/core/src/pydio/Core/Services/ConfService.php
@@ -449,8 +449,8 @@ public function switchRootDirInst($rootDirIndex=-1, $temporary=false)
             if(isSet($this->configs["ACCESS_DRIVER"])) unset($this->configs["ACCESS_DRIVER"]);
         }
 
-        if (isSet($this->configs["REPOSITORY"]) && $this->configs["REPOSITORY"]->getOption("CHARSET")!="") {
-            self::setContextCharset($this->configs["REPOSITORY"]->getOption("CHARSET"));
+        if (isSet($this->configs["REPOSITORY"]) && $this->configs["REPOSITORY"]->getSafeOption("CHARSET")!="") {
+            self::setContextCharset($this->configs["REPOSITORY"]->getSafeOption("CHARSET"));
         } else {
             self::clearContextCharset();
         }
diff --git a/core/src/plugins/access.smb/class.smbAccessWrapper.php b/core/src/plugins/access.smb/class.smbAccessWrapper.php
index fdeac7349e..51015f0d7d 100644
--- a/core/src/plugins/access.smb/class.smbAccessWrapper.php
+++ b/core/src/plugins/access.smb/class.smbAccessWrapper.php
@@ -77,7 +77,7 @@ protected static function initPath($path, $streamType, $storeOpenContext = false
             $pass = $safeCreds["password"];
             $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
             $credentials = "$login:$pass@";
-            $domain = $repoObject->getOption("DOMAIN");
+            $domain = $repoObject->getContextOption($node->getContext(), "DOMAIN");
             if($domain != "") {
                 if((strcmp(substr($domain, -1), "/") === 0) || (strcmp(substr($domain, -1), "\\") === 0)){
                     $credentials = $domain.$credentials;
@@ -86,7 +86,7 @@ protected static function initPath($path, $streamType, $storeOpenContext = false
                 }
             }
         }
-        $basePath = $repoObject->getOption("PATH");
+        $basePath = $repoObject->getContextOption($node->getContext(), "PATH");
         $fullPath = "smbclient://".$credentials.$host."/";//.$basePath."/".$path;
         if ($basePath!="") {
            $fullPath.=trim($basePath, "/\\" );
diff --git a/core/src/plugins/core.access/src/AbstractAccessDriver.php b/core/src/plugins/core.access/src/AbstractAccessDriver.php
index 2f9b1c04c4..38505a2b74 100644
--- a/core/src/plugins/core.access/src/AbstractAccessDriver.php
+++ b/core/src/plugins/core.access/src/AbstractAccessDriver.php
@@ -518,7 +518,7 @@ protected function deldir($location, $repoData, $taskId = null)
     public static function fixPermissions(AJXP_Node $node, &$stat, $remoteDetectionCallback = null)
     {
         $repoObject = $node->getRepository();
-        $fixPermPolicy = $repoObject->getOption("FIX_PERMISSIONS");
+        $fixPermPolicy = $repoObject->getContextOption($node->getContext(), "FIX_PERMISSIONS");
         $loggedUser = $node->getUser();
         if ($loggedUser == null) {
             return;
diff --git a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
index be15f3bd48..b938d187c0 100755
--- a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
+++ b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
@@ -359,7 +359,7 @@ public function loadUserAlerts(\Psr\Http\Message\ServerRequestInterface $request
                 $nodeRepo = $node->getRepository();
 
                 if($nodeRepo != null && $nodeRepo->hasParent() && $nodeRepo->getParentId() == $repositoryFilter){
-                    $currentRoot = $nodeRepo->getOption("PATH");
+                    $currentRoot = $nodeRepo->getContextOption($ctx, "PATH");
                     $contentFilter = $nodeRepo->getContentFilter();
                     if(isSet($contentFilter)){
                         $nodePath = $contentFilter->filterExternalPath($node->getPath());