diff --git a/workflow/engine/skinEngine/base/layout.html b/workflow/engine/skinEngine/base/layout.html
index 66fc025a1..cf192a18f 100755
--- a/workflow/engine/skinEngine/base/layout.html
+++ b/workflow/engine/skinEngine/base/layout.html
@@ -23,6 +23,10 @@
                     <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;<br/>
                     <label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b> &nbsp; &nbsp; <br/>
                     {$udate}</label>&nbsp; &nbsp;
+                  {else}
+                      {if $tracker eq 1}
+                          <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;
+                      {/if}
                   {/if}
                   </small>
                 </div>
diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html
index 0b99c7f99..ee901deb5 100644
--- a/workflow/engine/skinEngine/neoclassic/layout.html
+++ b/workflow/engine/skinEngine/neoclassic/layout.html
@@ -24,6 +24,10 @@
                       <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;<br/>
                       <label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b> &nbsp; &nbsp; <br/>
                       {$udate}</label>&nbsp; &nbsp;
+                    {else}
+                        {if $tracker eq 1}
+                            <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;
+                        {/if}
                     {/if}
                     </small>
                   </div>
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index af5f412a8..41e655874 100755
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -271,12 +271,12 @@ class SkinEngine
     $dirBody = null;
 
     if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
-    	
+
     	//Get the IE version
     	if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
     		$ie = intval($arrayMatch[1]);
     	}
-        
+
         $swTrident = (preg_match("/^.*Trident.*$/", $_SERVER["HTTP_USER_AGENT"]))? 1 : 0; //Trident only in IE8+
 
         $sw = 1;
@@ -284,8 +284,8 @@ class SkinEngine
         if ((($ie == 7 && $swTrident == 1) || $ie == 8) && !preg_match("/^ux.+$/", SYS_SKIN)) { //IE8
             $sw = 0;
         }
-        
-       
+
+
         if ($sw == 1) {
             if ($ie == 10 || $ie == 11 ) {
                 $ie = 8;
@@ -669,12 +669,12 @@ class SkinEngine
       $header = null;
 
       if (preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
-      	
-      	  //Get the IE version
-	      if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
-	          $ie = intval($arrayMatch[1]);
+
+      	  //Get the IE version
+	      if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)){
+	          $ie = intval($arrayMatch[1]);
 	      }
-	      
+
           if ($ie == 10 || $ie == 11) {
               $ie = 8;
 
@@ -767,9 +767,8 @@ class SkinEngine
         }
 
       if (defined('SYS_SYS')) {
-        $logout = '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
-      }
-      else {
+          $logout = "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . ((SYS_COLLECTION != "tracker")? "/login/login" : "/tracker/login");
+      } else {
         $logout = '/sys/' . SYS_LANG . '/' . SYS_SKIN . '/login/login';
       }
 
@@ -810,3 +809,4 @@ class SkinEngine
     }
   }
 }
+
diff --git a/workflow/engine/skinEngine/uxmodern/layout.html b/workflow/engine/skinEngine/uxmodern/layout.html
index 66fc025a1..cf192a18f 100644
--- a/workflow/engine/skinEngine/uxmodern/layout.html
+++ b/workflow/engine/skinEngine/uxmodern/layout.html
@@ -23,6 +23,10 @@
                     <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;<br/>
                     <label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b> &nbsp; &nbsp; <br/>
                     {$udate}</label>&nbsp; &nbsp;
+                  {else}
+                      {if $tracker eq 1}
+                          <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;
+                      {/if}
                   {/if}
                   </small>
                 </div>
diff --git a/workflow/engine/skinEngine/uxs/layout.html b/workflow/engine/skinEngine/uxs/layout.html
index e19068311..60af060ee 100644
--- a/workflow/engine/skinEngine/uxs/layout.html
+++ b/workflow/engine/skinEngine/uxs/layout.html
@@ -23,6 +23,10 @@
                     <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;<br/>
                     <label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b> &nbsp; &nbsp; <br/>
                     {$udate}</label>&nbsp; &nbsp;
+                  {else}
+                      {if $tracker eq 1}
+                          <a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;
+                      {/if}
                   {/if}
                   </small>
                 </div>