diff --git a/rbac/engine/classes/model/RbacUsers.php b/rbac/engine/classes/model/RbacUsers.php
index 2f2d547b7..9e76fd516 100644
--- a/rbac/engine/classes/model/RbacUsers.php
+++ b/rbac/engine/classes/model/RbacUsers.php
@@ -184,9 +184,10 @@ class RbacUsers extends BaseRbacUsers
         try {
             $c = new Criteria('rbac');
             $c->add(RbacUsersPeer::USR_UID, $sUsrUid);
-            $rs = RbacUsersPeer::doSelect($c, Propel::getDbConnection('rbac_ro'));
-            if (is_array($rs) && isset($rs[0]) && is_object($rs[0]) && get_class($rs[0]) == 'RbacUsers') {
-                $aFields = $rs[0]->toArray(BasePeer::TYPE_FIELDNAME);
+            $resultSet = RbacUsersPeer::doSelectRS($c, Propel::getDbConnection('rbac_ro'));
+            if ($resultSet->next()) {
+                $this->hydrate($resultSet);
+                $aFields = $this->toArray(BasePeer::TYPE_FIELDNAME);
                 return $aFields;
             }
             return false;
@@ -326,10 +327,14 @@ class RbacUsers extends BaseRbacUsers
      *
      * @param string $keyType One of the class type constants TYPE_PHPNAME,
      *                        TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @param boolean $original If true return de original verion of fields.
      * @return an associative array containing the field names (as keys) and field values
      */
-    public function toArray($keyType = BasePeer::TYPE_PHPNAME)
+    public function toArray($keyType = BasePeer::TYPE_PHPNAME, $original = false)
     {
+        if ($original) {
+            return parent::toArray($keyType);
+        }
         $key = RbacUsersPeer::translateFieldName(
             RbacUsersPeer::USR_PASSWORD,
             BasePeer::TYPE_COLNAME,
diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index eb92a080f..5cd394bb6 100644
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -83,8 +83,11 @@ class Users extends BaseUsers
         try {
             $oRow = UsersPeer::retrieveByPK( $UsrUid );
             if (! is_null( $oRow )) {
+                $this->fromArray(
+                    $oRow->toArray( BasePeer::TYPE_FIELDNAME, true ),
+                    BasePeer::TYPE_FIELDNAME
+                );
                 $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
-                $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
                 $this->setNew( false );
                 return $aFields;
             } else {
@@ -496,10 +499,14 @@ class Users extends BaseUsers
      *
      * @param string $keyType One of the class type constants TYPE_PHPNAME,
      *                        TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @param boolean $original If true return de original verion of fields.
      * @return an associative array containing the field names (as keys) and field values
      */
-    public function toArray($keyType = BasePeer::TYPE_PHPNAME)
+    public function toArray($keyType = BasePeer::TYPE_PHPNAME, $original = false)
     {
+        if ($original) {
+            return parent::toArray($keyType);
+        }
         $key = UsersPeer::translateFieldName(
             UsersPeer::USR_PASSWORD,
             BasePeer::TYPE_COLNAME,