diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index e6ce46e18..76d26c68f 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -2778,12 +2778,12 @@ $output = $outputHeader.$output;
     if ( defined('SYS_SKIN' )) $sysCon['SYS_SKIN'] = SYS_SKIN;
     if ( defined('SYS_SYS' ) ) $sysCon['SYS_SYS']  = SYS_SYS;
 
-    if (isset($_SESSION['APPLICATION']) ) $sysCon['APPLICATION'] = $_SESSION['APPLICATION'];
-    if (isset($_SESSION['PROCESS'])     ) $sysCon['PROCESS']     = $_SESSION['PROCESS'];
-    if (isset($_SESSION['TASK'])        ) $sysCon['TASK']        = $_SESSION['TASK'];
-    if (isset($_SESSION['INDEX'])       ) $sysCon['INDEX']       = $_SESSION['INDEX'];
-    if (isset($_SESSION['USER_LOGGED']) ) $sysCon['USER_LOGGED'] = $_SESSION['USER_LOGGED'];
-    if (isset($_SESSION['USR_USERNAME'])) $sysCon['USR_USERNAME']= $_SESSION['USR_USERNAME'];
+    $sysCon['APPLICATION'] = (isset($_SESSION['APPLICATION'])  )? $_SESSION['APPLICATION'] :'';
+    $sysCon['PROCESS']     = (isset($_SESSION['PROCESS'])      )? $_SESSION['PROCESS']     :'';
+    $sysCon['TASK']        =  (isset($_SESSION['TASK'])        )? $_SESSION['TASK']        :'';
+    $sysCon['INDEX']       = (isset($_SESSION['INDEX'])        )? $_SESSION['INDEX']       :'';
+    $sysCon['USER_LOGGED'] = (isset($_SESSION['USER_LOGGED'])  )? $_SESSION['USER_LOGGED'] :'';
+    $sysCon['USR_USERNAME']=  (isset($_SESSION['USR_USERNAME']))? $_SESSION['USR_USERNAME']:'';
     
     ################################################################################################
     # Added for compatibility betweek aplication called from web Entry that uses just WS functions
diff --git a/workflow/engine/methods/controls/varsAjaxByType.php b/workflow/engine/methods/controls/varsAjaxByType.php
index e84f4c835..084b83bbe 100644
--- a/workflow/engine/methods/controls/varsAjaxByType.php
+++ b/workflow/engine/methods/controls/varsAjaxByType.php
@@ -40,41 +40,44 @@ $aType = $_POST['type'];
 
 $aRows[0] = Array (
   'fieldname' => 'char',
-  'variable' => 'char',
-  'type' => 'type',
-  'label' => 'char'
+  'variable'  => 'char',
+  'type'      => 'type',
+  'label'     => 'char'
 );
 foreach ( $aFields as $aField ) {
   switch ($aType){
       case "system":
         if($aField['sType']=="system"){
             $aRows[] = Array (
-            'fieldname' => $_POST['sFieldName'],
-            'variable' => $_POST['sSymbol'] . $aField['sName'],
-            'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\''.$_POST['sFieldName'].'\',\''.$_POST['sSymbol'] . $aField['sName'].'\');">'.$_POST['sSymbol'] . $aField['sName'].'</a></div>',
-            'type' => $aField['sType'],
-            'label' => $aField['sLabel']
+            'fieldname'      => $_POST['sFieldName'],
+            'variable'       => $_POST['sSymbol'] . $aField['sName'],
+            'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\''.
+                                 $_POST['sFieldName'].'\',\''.$_POST['sSymbol'] . $aField['sName'].'\');">'.$_POST['sSymbol'] . $aField['sName'].'</a></div>',
+            'type'           => $aField['sType'],
+            'label'          => $aField['sLabel']
             );
         }
       break;
       case "process":
         if($aField['sType']!="system"){
             $aRows[] = Array (
-            'fieldname' => $_POST['sFieldName'],
-            'variable' => $_POST['sSymbol'] . $aField['sName'],
-            'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\''.$_POST['sFieldName'].'\',\''.$_POST['sSymbol'] . $aField['sName'].'\');">'.$_POST['sSymbol'] . $aField['sName'].'</a></div>',
-            'type' => $aField['sType'],
-            'label' => $aField['sLabel']
+            'fieldname'      => $_POST['sFieldName'],
+            'variable'       => $_POST['sSymbol'] . $aField['sName'],
+            'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\''.
+                                 $_POST['sFieldName'].'\',\''.$_POST['sSymbol'] . $aField['sName'].'\');">'.$_POST['sSymbol'] . $aField['sName'].'</a></div>',
+            'type'           => $aField['sType'],
+            'label'          => $aField['sLabel']
             );
         }
       break;
       default:
         $aRows[] = Array (
-        'fieldname' => $_POST['sFieldName'],
-        'variable' => $_POST['sSymbol'] . $aField['sName'],
-        'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\''.$_POST['sFieldName'].'\',\''.$_POST['sSymbol'] . $aField['sName'].'\');">'.$_POST['sSymbol'] . $aField['sName'].'</a></div>',
-        'type' => $aField['sType'],
-        'label' => $aField['sLabel']
+        'fieldname'      => $_POST['sFieldName'],
+        'variable'       => $_POST['sSymbol'] . $aField['sName'],
+        'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\''.$_POST['sFieldName'].'\',\''
+                             .$_POST['sSymbol'] . $aField['sName'].'\');">'.$_POST['sSymbol'] . $aField['sName'].'</a></div>',
+        'type'           => $aField['sType'],
+        'label'          => $aField['sLabel']
         );
       break;
   }
@@ -83,9 +86,12 @@ foreach ( $aFields as $aField ) {
 // Use and make a load translation variable call to the titles of the tabs
 $cssTabs = "<div id=\"".strtolower($_POST['type'])."\">
                 <ul id=\"tabnav\">
-                    <li class=\"all\"><a href=\"#\" onclick=\"changeVariables('all','".$_POST['sProcess']."','".$_POST['sFieldName']."','".$_POST['sSymbol']."','processVariablesContent');\">All variables</a></li>
-                    <li class=\"system\"><a href=\"#\" onclick=\"changeVariables('system','".$_POST['sProcess']."','".$_POST['sFieldName']."','".$_POST['sSymbol']."','processVariablesContent');\">System</a></li>
-                    <li class=\"process\"><a href=\"#\" onclick=\"changeVariables('process','".$_POST['sProcess']."','".$_POST['sFieldName']."','".$_POST['sSymbol']."','processVariablesContent');\">Process</a></li>
+                    <li class=\"all\"><a href=\"#\" onclick=\"changeVariables('all','".$_POST['sProcess']."','"
+                    .$_POST['sFieldName']."','".$_POST['sSymbol']."','processVariablesContent');\">All variables</a></li>
+                    <li class=\"system\"><a href=\"#\" onclick=\"changeVariables('system','".$_POST['sProcess']."','"
+                    .$_POST['sFieldName']."','".$_POST['sSymbol']."','processVariablesContent');\">System</a></li>
+                    <li class=\"process\"><a href=\"#\" onclick=\"changeVariables('process','".$_POST['sProcess']."','"
+                    .$_POST['sFieldName']."','".$_POST['sSymbol']."','processVariablesContent');\">Process</a></li>
                 </ul>
             </div>
             ";
@@ -101,9 +107,9 @@ G::LoadClass('ArrayPeer');
 $oCriteria = new Criteria('dbarray');
 $oCriteria->setDBArrayTable('dynavars');
 
-$aFields = array ();
+$aFields   = array ();
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->AddContent('propeltable', 'paged-table', 'triggers/dynavars', $oCriteria);
 G::RenderPage('publish', 'raw');
 
-?>
\ No newline at end of file
+?>