diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php
index 2048cf888..a256af55e 100755
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -42,7 +42,7 @@ function getLangFiles() {
   if (file_exists ( $dir )) {
     if ($handle = opendir ( $dir )) {
       while ( false !== ($file = readdir ( $handle )) ) {
-        
+
         $fileParts = explode ( ".", $file );
         if ($fileParts [0] == "translation") {
           $filesArray [$fileParts [1]] = $file;
@@ -128,11 +128,20 @@ G::RenderPage ( "publish" );
 
 ?>
 <script type="text/javascript">
+    var oInfoPanel;
     var openInfoPanel = function()
     {
+    
+    // note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
+    // the following lines of code are getting the hight of panel. Related 8021 bug
+    var hightpnl= 424;
+    var varjs = "<?=  isset($_POST['form']['USER_ENV'])?$_POST['form']['USER_ENV']:''; ?>";
+    if(varjs !=' ')
+      hightpnl= 330;
+    
       var oInfoPanel = new leimnud.module.panel();
       oInfoPanel.options = {
-        size    :{w:500,h:424},
+        size    :{w:500,h:hightpnl},
         position:{x:0,y:0,center:true},
         title   :'System Information',
         theme   :'processmaker',
@@ -148,13 +157,22 @@ G::RenderPage ( "publish" );
         backgroundColor: 'white'
       }};
       oInfoPanel.make();
+
       var oRPC = new leimnud.module.rpc.xmlhttp({
         url   : '../login/dbInfo',
-        async : false,
+        //async : false,
         method: 'POST',
         args  : ''
       });
+
+      oRPC.callback = function(oRPC) {
+      oInfoPanel.loader.hide();
+      var scs = oRPC.xmlhttp.responseText.extractScript();
+      oInfoPanel.addContent(oRPC.xmlhttp.responseText);
+      scs.evalScript();
+      }.extend(this);
+
       oRPC.make();
       oInfoPanel.addContent(oRPC.xmlhttp.responseText);
     };
-</script>
\ No newline at end of file
+</script>
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index 06964cc80..f839502f4 100644
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -107,9 +107,7 @@ if(isset($_GET['debug'])){
     print "<b>layout submenu file:</b>"; G::pr($layoutFileSubmenu);
 
 }
-// note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
-// the following line has true or false value to see the System information text. Related 8021 bug
-$toSeeMsg = (array_key_exists('_DBArray', $_SESSION) && array_key_exists('availableWorkspace', $_SESSION['_DBArray']))?true:false; 
+
 switch(strtolower($G_SKIN)){
     case "blank"://This is a special template but need main skin styles
         G::verifyPath ( PATH_SMARTY_C,     true );
@@ -171,7 +169,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
     $footer = '';
     if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
         if (DB_SYSTEM_INFORMATION == 1) {
-            $footer =(!$toSeeMsg)?"<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />":'';
+            $footer = "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />";
         }
 
         $freeOfChargeText = "";
@@ -319,7 +317,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
             $footer = '';
             if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
                 if ( defined('SYS_SYS') ) {
-                    $footer = (!$toSeeMsg)?"<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />":'';
+                    $footer = "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />";
                 }
                 $footer .= "<br />Copyright � 2003-2008 Colosa, Inc. All rights reserved.";
             }
@@ -408,7 +406,7 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
             $footer = '';
             if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
                 if (DB_SYSTEM_INFORMATION == 1) {
-                  $footer =(!$toSeeMsg) ? "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />":'';
+                  $footer = "<a href=\"#\" onclick=\"openInfoPanel();return false;\" class=\"FooterLink\">| System Information |</a><br />";
                 }
 
                 $freeOfChargeText = "";
diff --git a/workflow/engine/xmlform/login/dbInfo.xml b/workflow/engine/xmlform/login/dbInfo.xml
index fa6545d6f..0f09e8e9e 100755
--- a/workflow/engine/xmlform/login/dbInfo.xml
+++ b/workflow/engine/xmlform/login/dbInfo.xml
@@ -1,45 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm name="dbInfo" basedir="" width="450">
+<dynaForm name="dbInfo" basedir="" width="450" enableTemplate="0" ajaxSubmit="0" >
+
+
+<ENVIRONMENT type="hidden" />
+
 <DYNA_HEADER type="title">
   <en>System Information</en>
-<es><![CDATA[Información del sistema]]></es></DYNA_HEADER>
+</DYNA_HEADER>
 <FLUID type="caption" group="5">
   <en>ProcessMaker</en>
-<es>ProcessMaker</es></FLUID>
+</FLUID>
 <SYSTEM type="caption">
   <en>Operating System</en>
-<es>Sistema operativo</es></SYSTEM>
+</SYSTEM>
 <TIME_ZONE type="caption">
   <en>Time zone</en>
 </TIME_ZONE>
 <SERVER_SOFTWARE type="caption">
   <en>Web Server</en>
-<es>Servidor Web</es></SERVER_SOFTWARE>
+</SERVER_SOFTWARE>
 <SERVER_NAME type="caption" group="4">
   <en>Server Name</en>
-<es>Nombre del servidor</es></SERVER_NAME>
+</SERVER_NAME>
 <SERVER_ADDR type="caption">
   <en>Server IP Address</en>
-<es>IP del servidor</es></SERVER_ADDR>
+</SERVER_ADDR>
 <PHP type="caption">
   <en>PHP version</en>
-<es><![CDATA[Versión PHP]]></es></PHP>
+</PHP>
 <DATABASE type="caption">
   <en>Database</en>
-<es>Base de Datos</es></DATABASE>
+</DATABASE>
 <DATABASE_SERVER type="caption">
   <en>Database Server IP Address</en>
-<es><![CDATA[Dirección IP de la Base de Datos]]></es></DATABASE_SERVER>
+</DATABASE_SERVER>
 <DATABASE_NAME type="caption">
   <en>Database Name</en>
-<es>Nombre de la Base de Datos</es></DATABASE_NAME>
+</DATABASE_NAME>
 <AVAILABLE_DB type="caption">
   <en>Available Databases</en>
-<es>Bases de datos disponibles</es></AVAILABLE_DB>
+</AVAILABLE_DB>
 <HTTP_USER_AGENT type="caption">
   <en><![CDATA[User's Browser]]></en>
-<es>Navegador del usuario</es></HTTP_USER_AGENT>
+</HTTP_USER_AGENT>
 <IP type="caption">
   <en><![CDATA[User's Ip Address]]></en>
-<es>IP del usuario</es></IP>
-</dynaForm>  
+</IP>
+<JS type="javascript"><![CDATA[
+// note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
+// the following fields are hidden if we've not chosen a workspace. Related 8021 bug
+//var dynaformOnload = function(){
+  if(getField('ENVIRONMENT').value=='Not defined'){
+  hideRowById('DATABASE')
+  hideRowById('DATABASE_SERVER');
+  hideRowById('DATABASE_NAME');
+  hideRowById('AVAILABLE_DB');
+  }
+//};
+]]></JS>
+</dynaForm>
+
+
+