diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index dc830166e..0f3dd1d07 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -179,7 +179,7 @@ try {
             $oTaskNewPattern = new Task();
             $oTaskNewPattern->load($oData->tas_uid);
             $titleTask=$oTaskNewPattern->getTasTitle();
-            G::auditlog("OptionsMenuTask",'ACTION : Delete Stak -> '.$titleTask.' : '.$oData->tas_uid);
+            G::auditlog("OptionsMenuTask",'Delete Stak -> '.$titleTask.' : '.$oData->tas_uid);
             $sOutput = $oProcessMap->deleteTask($oData->tas_uid);
             break;
         case 'addGuide':
@@ -381,7 +381,7 @@ try {
             $oTaskNewPattern = new Task();
             $oTaskNewPattern->load($oData->tas_uid);
             $titleTask=$oTaskNewPattern->getTasTitle();
-            G::auditlog("OptionsMenuTask",'ACTION : Delete All Routes -> '.$titleTask.' : '.$oData->tas_uid);
+            G::auditlog("OptionsMenuTask",'Delete All Routes In -> '.$titleTask.' : '.$oData->tas_uid);
             $oTasks = new Tasks();
             $oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid);
             break;
@@ -422,7 +422,7 @@ try {
             $oTaskNewPattern = new Task();
             $oTaskNewPattern->load($oData->tas_uid);
             $titleTask=$oTaskNewPattern->getTasTitle();
-            G::auditlog("OptionsMenuTask",'ACTION : Delete Sub Process -> '.$titleTask.' : '.$oData->tas_uid);
+            G::auditlog("OptionsMenuTask",'Delete Sub Process -> '.$titleTask.' : '.$oData->tas_uid);
             $sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid);
             break;
         case 'subProcess_Properties':
diff --git a/workflow/engine/methods/steps/conditions_Save.php b/workflow/engine/methods/steps/conditions_Save.php
index 343e3a1ef..7bbc3aa58 100755
--- a/workflow/engine/methods/steps/conditions_Save.php
+++ b/workflow/engine/methods/steps/conditions_Save.php
@@ -43,6 +43,7 @@ try {
         $value = $_POST;
     $oStep->update( array ('STEP_UID' => $value['STEP_UID'],'STEP_CONDITION' => $value['STEP_CONDITION']
     ) );
+    G::auditlog("OptionsMenuTask","Save Condition In Step -> ".$value['STEP_UID'].' In Task -> '.$value['TAS_UID'].' Condition -> '.$value['STEP_CONDITION']);
     G::LoadClass( 'processMap' );
     $oProcessMap = new ProcessMap();
     $oProcessMap->getStepsCriteria( $value['TAS_UID'] );
diff --git a/workflow/engine/methods/steps/steps_Ajax.php b/workflow/engine/methods/steps/steps_Ajax.php
index 3a914ba60..7c89bbf5a 100755
--- a/workflow/engine/methods/steps/steps_Ajax.php
+++ b/workflow/engine/methods/steps/steps_Ajax.php
@@ -118,6 +118,7 @@ try {
             }
             break;
         case 'assignTrigger':
+        G::auditlog("OptionsMenuTask","Assign Trigger In Step-> ".$aData['STEP_UID'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['ST_TYPE'].' Condition -> '.$aData['ST_CONDITION'].' Trigger UID -> '.$aData['TRI_UID']);
             $aFields = array (
                 'STEP_UID' => $aData['STEP_UID'],
                 'TAS_UID' => $_SESSION['TASK'],
@@ -157,17 +158,20 @@ try {
             $oStepTrigger->update( array ('STEP_UID' => $aData['STEP_UID'],'TAS_UID' => $_SESSION['TASK'],'TRI_UID' => $aData['TRI_UID'],'ST_TYPE' => $aData['ST_TYPE'],'ST_CONDITION' => $aData['ST_CONDITION']
             ) );
             break;
-        case 'upTrigger':
+        case 'upTrigger':        
             $aData['iPosition'] = (int) $aData['iPosition'];
+            G::auditlog("OptionsMenuTask","Up Trigger In Step-> ".$aData['sStep'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['sType'].' Trigger Position -> '.$aData['iPosition'].' Trigger UID -> '.$aData['sTrigger']);
             $oStepTrigger = new StepTrigger();
             $oStepTrigger->up( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition'] );
             break;
         case 'downTrigger':
             $aData['iPosition'] = (int) $aData['iPosition'];
+            G::auditlog("OptionsMenuTask","Down Trigger In Step-> ".$aData['sStep'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['sType'].' Trigger Position -> '.$aData['iPosition'].' Trigger UID -> '.$aData['sTrigger']);
             $oStepTrigger = new StepTrigger();
             $oStepTrigger->down( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'], $aData['iPosition'] );
             break;
         case 'ofToAssignTrigger':
+        G::auditlog("OptionsMenuTask","Delete Trigger In Step-> ".$aData['sStep'].' In Task -> '.$_SESSION['TASK'].' Trigger Type -> '.$aData['sType'].' Trigger Position -> '.$aData['iPosition'].' Trigger UID -> '.$aData['sTrigger']);
             $oStepTrigger = new StepTrigger();
             $oStepTrigger->reOrder( $aData['sStep'], $_SESSION['TASK'], $aData['sType'], $aData['iPosition'] );
             $oStepTrigger->remove( $aData['sStep'], $_SESSION['TASK'], $aData['sTrigger'], $aData['sType'] );
diff --git a/workflow/engine/methods/steps/steps_Delete.php b/workflow/engine/methods/steps/steps_Delete.php
index 70bc82c5b..95ffabcf0 100755
--- a/workflow/engine/methods/steps/steps_Delete.php
+++ b/workflow/engine/methods/steps/steps_Delete.php
@@ -39,6 +39,7 @@ try {
     $oStep = new Step();
     $oStep->reOrder( $_POST['STEP_UID'], $_POST['STEP_POSITION'] );
     $oStep->remove( $_POST['STEP_UID'] );
+    G::auditlog("OptionsMenuTask","Step Delete -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']);
     G::LoadClass( 'processMap' );
     $oProcessMap = new ProcessMap();
     $oProcessMap->getStepsCriteria( $_POST['TASK'] );
diff --git a/workflow/engine/methods/steps/steps_Down.php b/workflow/engine/methods/steps/steps_Down.php
index 5e0a70f57..ffde7fea5 100755
--- a/workflow/engine/methods/steps/steps_Down.php
+++ b/workflow/engine/methods/steps/steps_Down.php
@@ -38,10 +38,10 @@ try {
     require_once 'classes/model/Step.php';
     $oStep = new Step();
     $oStep->down( $_POST['STEP_UID'], $_POST['TASK'], $_POST['STEP_POSITION'] );
+    G::auditlog("OptionsMenuTask","Step Down -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']);
     G::LoadClass( 'processMap' );
     $oProcessMap = new ProcessMap();
     $oProcessMap->getStepsCriteria( $_POST['TASK'] );
 } catch (Exception $oException) {
     die( $oException->getMessage() );
 }
-
diff --git a/workflow/engine/methods/steps/steps_Save.php b/workflow/engine/methods/steps/steps_Save.php
index fecd184ee..8f0a380d6 100755
--- a/workflow/engine/methods/steps/steps_Save.php
+++ b/workflow/engine/methods/steps/steps_Save.php
@@ -41,6 +41,7 @@ try {
     ) );
     $oStep->update( array ('STEP_UID' => $sStepUID,'STEP_TYPE_OBJ' => $_POST['sType'],'STEP_UID_OBJ' => $_POST['sUID'],'STEP_POSITION' => ($oStep->getNextPosition( $_POST['sTask'] ) - 1),'STEP_MODE' => (isset( $_POST['sMode'] )) ? $_POST['sMode'] : 'EDIT'
     ) );
+    G::auditlog("OptionsMenuTask","Save New Step -> ".$_POST['sUID'].' In Task -> '.$_POST['sTask'].' Type Step -> '.$_POST['sType']);
     G::LoadClass( 'processMap' );
     $oProcessMap = new ProcessMap();
     $oProcessMap->getStepsCriteria( $_POST['sTask'] );
diff --git a/workflow/engine/methods/steps/steps_Up.php b/workflow/engine/methods/steps/steps_Up.php
index bc780cff5..1206cef99 100755
--- a/workflow/engine/methods/steps/steps_Up.php
+++ b/workflow/engine/methods/steps/steps_Up.php
@@ -38,10 +38,10 @@ try {
     require_once 'classes/model/Step.php';
     $oStep = new Step();
     $oStep->up( $_POST['STEP_UID'], $_POST['TASK'], $_POST['STEP_POSITION'] );
+    G::auditlog("OptionsMenuTask","Step Up -> ".$_POST['STEP_UID'].' In Task -> '.$_POST['TASK'].' Step Position -> '.$_POST['STEP_POSITION']);
     G::LoadClass( 'processMap' );
     $oProcessMap = new ProcessMap();
     $oProcessMap->getStepsCriteria( $_POST['TASK'] );
 } catch (Exception $oException) {
     die( $oException->getMessage() );
 }
-
diff --git a/workflow/engine/methods/tasks/tasks_Ajax.php b/workflow/engine/methods/tasks/tasks_Ajax.php
index 28f8ef4e6..ca622661e 100755
--- a/workflow/engine/methods/tasks/tasks_Ajax.php
+++ b/workflow/engine/methods/tasks/tasks_Ajax.php
@@ -35,7 +35,6 @@ try {
     switch ($sAction) {
         case "saveTaskData":
             require_once ("classes/model/Task.php");
-
             $response = array ();
 
             $oTask = new Task();
@@ -118,7 +117,17 @@ try {
             $oTaskNewPattern = new Task();
             $oTaskNewPattern->load($aData['TAS_UID']);
             $titleTask=$oTaskNewPattern->getTasTitle();
-            G::auditLog("DerivationRule","ASSIGN STARTING TASK : Task Name -> ".$titleTask.' : '.$aData['TAS_UID']);
+            if (count($aData)==5) {
+                G::auditLog("DerivationRule",'ASSIGN STARTING TASK : Task Name -> '.$titleTask.' : '.$aData['TAS_UID']);
+            }else{
+                $values='';
+                foreach ($aData as $key => $value){
+                    if ($value!='') {
+                        $values.=$key.' -> '.$value.' ';
+                    }
+                }
+                G::auditLog("OptionsMenuTask","Update Task DETAILS : ".$values);
+            }            
             $result = $oTask->update( $aData );
 
             $response["status"] = "OK";
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index 4eb621755..727161232 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -86,11 +86,13 @@ try {
             switch ((int) $_POST['TU_RELATION']) {
                 case 1:
                     echo $oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
+                    G::auditlog("OptionsMenuTask","Assign User In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
                     break;
                 case 2:
                     echo $oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
+                    G::auditlog("OptionsMenuTask","Assign Group In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
                     break;
-            }
+            }            
             break;
         case 'ofToAssign':
             G::LoadClass('tasks');
@@ -98,11 +100,13 @@ try {
             switch ((int) $_POST['TU_RELATION']) {
                 case 1:
                     echo $oTasks->ofToAssignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
+                    G::auditlog("OptionsMenuTask","Delete Group In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
                     break;
                 case 2:
                     echo $oTasks->ofToAssignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']);
+                    G::auditlog("OptionsMenuTask","Delete User In Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
                     break;
-            }
+            }            
             break;
         case 'changeView':
             $_SESSION['iType'] = $_POST['TU_TYPE'];