diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 9e56e412a..9fd60ac96 100755
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -69,7 +69,7 @@ function skinList ()
                 } else {
                     $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
                 }
-                
+
                 $skinListArray['skins'][] = $value;
             }
         }
@@ -134,6 +134,7 @@ function newSkin ($baseSkin = 'classic')
         //TODO: Improve this pre_replace lines
         $configFileOriginal = $pathBase . "config.xml";
         $configFileFinal = PATH_CUSTOM_SKINS . $skinFolder . PATH_SEP . 'config.xml';
+
         $xmlConfiguration = file_get_contents( $configFileOriginal );
 
         $workspace = ($_REQUEST['workspace'] == 'global') ? '' : SYS_SYS;
@@ -143,8 +144,8 @@ function newSkin ($baseSkin = 'classic')
 
         $xmlConfiguration = preg_replace( '/(<id>)(.+?)(<\/id>)/i', '<id>' . G::generateUniqueID() . '</id><!-- $2 -->', $xmlConfiguration );
 
-        if ($workspace != "" && isset($skinInformationArray["workspace"]["__VALUE__"])) {
-            $workspace = (!empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
+        if (isset($skinInformationArray["workspace"]["__VALUE__"])) {
+            $workspace = ($workspace != "" && !empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
 
             $xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration);
             $xmlConfiguration = preg_replace("/(<name>)(.*)(<\/name>)/i", "<name>" . $skinName . "</name><!-- $2 -->", $xmlConfiguration);
@@ -260,8 +261,8 @@ function importSkin ()
         $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
         $skinInformationArray = $xmlConfigurationObj->result["skinConfiguration"]["__CONTENT__"]["information"]["__CONTENT__"];
 
-        if ($workspace != "" && isset($skinInformationArray["workspace"]["__VALUE__"])) {
-            $workspace = (!empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
+        if (isset($skinInformationArray["workspace"]["__VALUE__"])) {
+            $workspace = ($workspace != "" && !empty($skinInformationArray["workspace"]["__VALUE__"]))? $skinInformationArray["workspace"]["__VALUE__"] . "|" . $workspace : $workspace;
 
             $xmlConfiguration = preg_replace("/(<workspace>)(.*)(<\/workspace>)/i", "<workspace>" . $workspace . "</workspace><!-- $2 -->", $xmlConfiguration);
         } else {