diff --git a/php/classes/UserMgr.php b/php/classes/UserMgr.php
index b52059f..380c7a5 100644
--- a/php/classes/UserMgr.php
+++ b/php/classes/UserMgr.php
@@ -307,7 +307,10 @@ class UserMgr
 	
 		if ($init_res['success']) { // USERWSDIR.'RemoteParams.xml' exists
 			// check/change access rights
-			$basesWS = $this->paramMgr->xmlDom->getElementsByTagName('dataCenter');  // RemoteParams.xml
+
+            $xpath = new DOMXpath($this->paramMgr->xmlDom);
+
+			$basesWS = $xpath->query('//dataCenter');  // RemoteParams.xml
 			$delete = new UserDeleteObsolete();
 			
 			$basesWsId = array();
@@ -379,10 +382,10 @@ class UserMgr
 					}
 
 					if ($baseId !== "FMI_GUMICS") {
-						// Update Info on External Data Sets in RemoteTree.xml  
-						$dataSets = $base->getElementsByTagName("dataset");
-						if ($dataSets->length > 0) {
-							foreach ($dataSets as $dataSet) {
+						// Update Info on External Data Sets in RemoteTree.xml
+                        $dataSets = $xpath->query('.//dataset', $base);
+                        if ($dataSets->length > 0) {
+                            foreach ($dataSets as $dataSet) {
 								$dataSetID = $dataSet->getAttribute("xml:id");
 								$origDataSet = $this->baseExtXml->getElementById($dataSetID);
 								if ($origDataSet != null) {
--
libgit2 0.21.2