diff --git a/workflow/engine/classes/class.tasks.php b/workflow/engine/classes/class.tasks.php
index ac2744612..f15786669 100644
--- a/workflow/engine/classes/class.tasks.php
+++ b/workflow/engine/classes/class.tasks.php
@@ -378,6 +378,10 @@ class Tasks
       ObjectPermissionPeer::doDelete($oCriteria);
       //Delete task
       $oTask->remove($sTaskUID);
+      //Delete cases schedulers added by krlos
+      $oCriteria = new Criteria('workflow');
+      $oCriteria->add(CaseSchedulerPeer::TAS_UID, $sTaskUID);
+      CaseSchedulerPeer::doDelete($oCriteria);
     }
     catch (Exception $oError) {
       throw($oError);
@@ -851,4 +855,4 @@ class Tasks
  }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index e2f6d7886..c18b1c3c2 100644
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -1457,7 +1457,7 @@ var processmap=function(){
           {image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_TASK,launch:this.parent.closure({instance:this,method:function(index){
             var data = this.data.db.task[index];
             new this.parent.module.app.confirm().make({
-              label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+data.label,
+              label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+ data.label,
               action:function()
               {
                 data.object.drag.flush();
@@ -1472,7 +1472,7 @@ var processmap=function(){
               }.extend(this)
             });
             return;
-            if(confirm(G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+data.label))
+            if(confirm(G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+ data.label))
             {
               data.object.drag.flush();
               this.dropables.derivation.unregister(data.object.dropIndex);
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.html b/workflow/engine/xmlform/cases/cases_Scheduler_New.html
index b9099b78f..26e79e042 100755
--- a/workflow/engine/xmlform/cases/cases_Scheduler_New.html
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.html
@@ -158,6 +158,7 @@
 															{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/> 
 														</td>
 													</tr>
+
 												</table>
               </td>
               </tr>
@@ -222,7 +223,7 @@
               
 
                                                <tr>
-              <td class="FormButton" colspan="2" align="">{$form.BTNCANCEL}&nbsp;&nbsp;{$form.SAVE}</td>              
+              <td class="FormButton" colspan="2" align="">{$form.SAVE}&nbsp;&nbsp;{$form.BTNCANCEL}</td>              
              </tr>
                                                                    </tbody></table>
         </td>