diff --git a/rbac/engine/config/schema.xml b/rbac/engine/config/schema.xml
index 3c7807171..a4fe00650 100755
--- a/rbac/engine/config/schema.xml
+++ b/rbac/engine/config/schema.xml
@@ -108,7 +108,7 @@
     <column name="SYS_UPDATE_DATE" type="TIMESTAMP" />
     <column name="SYS_STATUS" type="INTEGER" required="true" default="0" />
   </table>
-  <table name="RBAC_USERS">
+  <table name="USERS">
     <vendor type="mysql">
       <parameter name="Name" value="USERS"/>
       <parameter name="Engine" value="MyISAM"/>
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index fd908524e..3e9db1084 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -338,12 +338,12 @@ class workspaceTools
      */
     private function getDatabase($rbac = false)
     {
-        if (isset($this->db) && $this->db->isConnected()) {
+        if (isset($this->db) && $this->db->isConnected() &&  $rbac == false) {
             return $this->db;
         }
 
         G::LoadSystem('database_' . strtolower($this->dbAdapter));
-        if ($rbac = true){
+        if ($rbac == true){
             $this->db = new database($this->dbAdapter, $this->dbRbacHost, $this->dbRbacUser, $this->dbRbacPass, $this->dbRbacName);
         } else {
         	$this->db = new database($this->dbAdapter, $this->dbHost, $this->dbUser, $this->dbPass, $this->dbName);
@@ -383,7 +383,7 @@ class workspaceTools
      */
     public function getSchema($rbac = false)
     {
-        $oDataBase = $this->getDatabase($rbac);
+    	$oDataBase = $this->getDatabase($rbac);
 
         $aOldSchema = array();
 
@@ -667,7 +667,7 @@ class workspaceTools
             throw new Exception("Only MySQL is supported");
         }
 
-        $workspaceSchema = $this->getSchema($rbac); 
+        $workspaceSchema = $this->getSchema($rbac);
 
         $changes = System::compareSchema($workspaceSchema, $schema);