diff --git a/module/todo/control.php b/module/todo/control.php
index e3fc26341e..5b04b422b0 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -376,16 +376,15 @@ class todo extends control
             if($todo->type == 'story') $app = 'product';
 
             $cancelURL   = $this->server->http_referer;
-            if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success', 'message' => sprintf($this->lang->todo->$confirmNote, $todo->objectID), 'locate' => $confirmURL));
-            return print(strpos($cancelURL, 'calendar') ? json_encode(array(sprintf($this->lang->todo->$confirmNote, $todo->objectID), $confirmURL)) : js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->objectID), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
+            return $this->send(array('result' => 'success', 'load' => array('confirm' => sprintf($this->lang->todo->{$confirmNote}, $todo->objectID), 'confirmed' => $confirmURL, 'canceled' => $cancelURL)));
         }
 
         if(defined('RUN_MODE') && RUN_MODE == 'api')
         {
             return $this->send(array('status' => 'success'));
         }
-        if(isonlybody()) return print(js::reload('parent.parent'));
-        return print(js::reload('parent'));
+        if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
+        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo')));
     }
 
     /**