diff --git a/workflow/engine/classes/class.pmLicenseManager.php b/workflow/engine/classes/class.pmLicenseManager.php
index 02e9e922c..1ec882cf5 100644
--- a/workflow/engine/classes/class.pmLicenseManager.php
+++ b/workflow/engine/classes/class.pmLicenseManager.php
@@ -56,7 +56,7 @@ class pmLicenseManager
         $this->licensedfeatures = array();
         $this->licensedfeaturesList = array();
         if (in_array($this->result, $validStatus)) {
-            $this->serial="3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK°DoqCt2Kqgpq6Vg37s";
+            $this->serial="3ptta7Xko2prrptrZnSd356aqmPXvMrayNPFj6CLdaR1pWtrW6qPw9jV0OHjxrDGu8LVxtmSm9nP5kR23HRpdZWccpeui+bKkK�DoqCt2Kqgpq6Vg37s";
             $info['FIRST_NAME']       = $results['DATA']['FIRST_NAME'];
             $info['LAST_NAME']        = $results['DATA']['LAST_NAME'];
             $info['DOMAIN_WORKSPACE'] = $results['DATA']['DOMAIN_WORKSPACE'];
@@ -75,6 +75,7 @@ class pmLicenseManager
                 $resultsRegister = $results['LIC'];
                 $this->server    = $results['LIC']['SRV'];
                 $this->file      = $results['LIC']['FILE'];
+                $this->workspace = isset($results['LIC']['WORKSPACE']) ? $results['LIC']['WORKSPACE'] : 'pmLicenseSrv';
                 $this->licenseSerial      = (isset($results['LIC']['SERIAL']))              ? $results['LIC']['SERIAL']                 : '';
                 $this->supportStartDate   = (isset($results['DATA']['SUPPORT_START_DATE'])) ? $results['DATA']['SUPPORT_START_DATE']    : '';
                 $this->supportEndDate     = (isset($results['DATA']['SUPPORT_END_DATE']))   ? $results['DATA']['SUPPORT_END_DATE']      : '';
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 051f32163..7d7daec9d 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -41,7 +41,7 @@ class AddonsStore extends BaseAddonsStore
             $criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
             $criteria->addSelectColumn("*");
             $criteria->add(AddonsStorePeer::STORE_TYPE, "license", Criteria::EQUAL);
-            $criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
+            //$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
 
             foreach (AddonsStorePeer::doSelect($criteria) as $store) {
                 $store->clear();
@@ -53,7 +53,8 @@ class AddonsStore extends BaseAddonsStore
             if (AddonsStorePeer::retrieveByPK($licenseManager->id) === null) {
                 preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
                 $realId = urlencode($matches[1]);
-                $addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId";
+                $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
+                $addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
 
                 self::addStore($licenseManager->id, $addonLocation);
 
@@ -547,7 +548,8 @@ class AddonsStore extends BaseAddonsStore
                         $addon->setAddonStatus(isset($addonInfo->status)? $addonInfo->status : "");
                         $addon->setAddonType(isset($addonInfo->type)? $addonInfo->type : "");
                         $addon->setAddonPublisher(isset($addonInfo->publisher)? $addonInfo->publisher : "");
-                        $addon->setAddonDownloadUrl(isset($addonInfo->download_url)? $addonInfo->download_url : "http://" . $pmLicenseManagerO->server . "/syspmLicenseSrv/en/green/services/rest?action=getPlugin&OBJ_UID=" . $addonInfo->guid);
+                        $workspace = (isset($pmLicenseManagerO->workspace)) ? $pmLicenseManagerO->workspace : 'pmLicenseSrv';
+                        $addon->setAddonDownloadUrl(isset($addonInfo->download_url)? $addonInfo->download_url : "http://" . $pmLicenseManagerO->server . "/sys".$workspace."/en/green/services/rest?action=getPlugin&OBJ_UID=" . $addonInfo->guid);
                         $addon->setAddonDownloadMd5(isset($addonInfo->download_md5)? $addonInfo->download_md5 : "");
                         $addon->setAddonReleaseDate(isset($addonInfo->release_date)? $addonInfo->release_date : "");
                         $addon->setAddonReleaseType(isset($addonInfo->release_type)? $addonInfo->release_type : '');
diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index 333d28d16..b967ba9dd 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -78,7 +78,8 @@ try {
                     preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
                     $realId = urlencode($matches[1]);
 
-                    $addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId";
+                    $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
+                    $addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
 
                     ///////
                     $cnn = Propel::getConnection("workflow");
@@ -261,8 +262,8 @@ try {
                 ///////
                 $licenseManager = &pmLicenseManager::getSingleton();
                 $server = $licenseManager->server;
-
-                $url = "http://$server/syspmLicenseSrv/en/green/services/rest";
+                $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
+                $url = "http://$server/sys".$workspace."/en/green/services/rest";
 
                 if (EnterpriseUtils::checkConnectivity($url) == false) {
                     throw (new Exception("Server \"$server\" not available."));
diff --git a/workflow/engine/methods/enterprise/processMakerAjax.php b/workflow/engine/methods/enterprise/processMakerAjax.php
index 6708154a0..86d605485 100644
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -121,8 +121,9 @@ switch ($option) {
             ///////
             $licenseManager = &pmLicenseManager::getSingleton();
             $server = isset($licenseManager->server) ? $licenseManager->server : '';
+            $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
-            $url = "http://$server/syspmLicenseSrv/en/green/services/rest";
+            $url = "http://$server/sys".$workspace."/en/green/services/rest";
 
             if (EnterpriseUtils::checkConnectivity($url) == false) {
                 throw (new Exception("Server '$server' not available."));
@@ -296,8 +297,9 @@ switch ($option) {
             ///////
             $licenseManager = &pmLicenseManager::getSingleton();
             $server = (isset($licenseManager->server)) ? $licenseManager->server : '';
+            $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
-            $url = "http://$server/syspmLicenseSrv/en/green/services/rest";
+            $url = "http://$server/sys".$workspace."/en/green/services/rest";
 
             if (EnterpriseUtils::checkConnectivity($url) == false) {
                 throw (new Exception("Server '$server' not available."));
@@ -338,7 +340,7 @@ switch ($option) {
 
             $results = file_get_contents($url, false, $context);
             $results = G::json_decode($results);
-            $results = $results[0];
+            $results = isset($results[0]) ? $results[0] :array();
 
             $pmVersion = EnterpriseUtils::pmVersion(PM_VERSION);
             $versions = array();
diff --git a/workflow/engine/methods/login/licenseUpdate.php b/workflow/engine/methods/login/licenseUpdate.php
index 4c4eef55a..10e8f59d0 100755
--- a/workflow/engine/methods/login/licenseUpdate.php
+++ b/workflow/engine/methods/login/licenseUpdate.php
@@ -22,8 +22,9 @@ if ($aux['extension'] != 'dat') {
         $licenseManager = new pmLicenseManager();
         preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
         $realId = urlencode($matches[1]);
+        $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
-        $addonLocation = "http://{$licenseManager->server}/syspmLicenseSrv/en/green/services/addonsStore?action=getInfo&licId=$realId";
+        $addonLocation = "http://{$licenseManager->server}/sys".$workspace."/en/green/services/addonsStore?action=getInfo&licId=$realId";
 
         ///////
         $cnn = Propel::getConnection("workflow");