diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php
index 6c7b6a9b6..64b4ff0fe 100755
--- a/workflow/engine/classes/model/CalendarDefinition.php
+++ b/workflow/engine/classes/model/CalendarDefinition.php
@@ -450,5 +450,14 @@ class CalendarDefinition extends BaseCalendarDefinition
         $oDataset->next();
         return $oDataset->getRow();
     }
+
+    public function calendarName ($calendarUid)
+    {
+        $tr = CalendarDefinitionPeer::retrieveByPK( $calendarUid );
+        if ((is_object( $tr ) && get_class( $tr ) == 'CalendarDefinition')) {
+            return $tr->getCalendarName();
+        }
+        return false; 
+    }
 }
 
diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index bc1317365..9b7ad4e9b 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -261,7 +261,7 @@ class Users extends BaseUsers
             //Calendar
             $calendar = new Calendar();
             $calendarInfo = $calendar->getCalendarFor( $userUid, $userUid, $userUid );
-            $aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";
+            $aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";                        
 
             //Photo
             $pathPhoto = PATH_IMAGES_ENVIRONMENT_USERS . $userUid . ".gif";
@@ -287,10 +287,21 @@ class Users extends BaseUsers
             $arrayData["birthday"] = $aFields["USR_BIRTHDAY"];
             $arrayData["position"] = $aFields["USR_POSITION"];
             $arrayData["replacedby"] = $aFields["USR_REPLACED_BY"];
+            if(strlen($arrayData["replacedby"] != 0)){
+                $oUser = UsersPeer::retrieveByPK( $arrayData["replacedby"] );
+                $arrayData["replacedbyfullname"] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
+            } 
             $arrayData["duedate"] = $aFields["USR_DUE_DATE"];
             $arrayData["calendar"] = $aFields["USR_CALENDAR"];
+            if(strlen($aFields["USR_CALENDAR"] != 0)){
+                $arrayData["calendarname"] = $calendar->calendarName( $aFields["USR_CALENDAR"] );                
+            }            
             $arrayData["status"] = $aFields["USR_STATUS"];
             $arrayData["department"] = $aFields["DEP_UID"];
+            if (strlen($arrayData["department"]) != 0) {
+                $oDepart = DepartmentPeer::retrieveByPk( $arrayData["department"] );
+                $arrayData["departmentname"] = $oDepart->getDepTitle();
+            }
             $arrayData["reportsto"] = $aFields["USR_REPORTS_TO"];
             $arrayData["userexperience"] = $aFields["USR_UX"];
             $arrayData["photo"] = $pathPhoto;