diff --git a/include/class.task.php b/include/class.task.php
index edf0a0e87e3fef8df2048e4ce24b22b976c9549a..ed8b5a0897a11c96cab6615f6567a4b0c5e79dbf 100644
--- a/include/class.task.php
+++ b/include/class.task.php
@@ -805,8 +805,8 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
 
         $assignee = $this->getStaff();
 
-        if (isset($vars['task_status']))
-            $this->setStatus($vars['task_status']);
+        if (isset($vars['task:status']))
+            $this->setStatus($vars['task:status']);
 
         $this->onActivity(array(
             'activity' => $note->getActivity(),
@@ -835,12 +835,9 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
             return null;
 
         $assignee = $this->getStaff();
-        // Set status - if checked.
-        if ($vars['reply_status_id']
-            && $vars['reply_status_id'] != $this->getStatusId()
-        ) {
-            $this->setStatus($vars['reply_status_id']);
-        }
+
+        if (isset($vars['task:status']))
+            $this->setStatus($vars['task:status']);
 
         /*
         // TODO: add auto claim setting for tasks.
diff --git a/include/staff/templates/task-view.tmpl.php b/include/staff/templates/task-view.tmpl.php
index 34c41599f01473e48ab0749fce42a0295c0a9fc6..2d7873c9375d66cd3c2811a86c7003d61e2f81ce 100644
--- a/include/staff/templates/task-view.tmpl.php
+++ b/include/staff/templates/task-view.tmpl.php
@@ -394,7 +394,7 @@ else
                 <td>
                     <div><?php echo __('Status');?>
                         <span class="faded"> - </span>
-                        <select  name="task_status">
+                        <select  name="task:status">
                             <option value="open" <?php
                                 echo $task->isOpen() ?
                                 'selected="selected"': ''; ?>> <?php
@@ -410,7 +410,7 @@ else
                             } ?>
                         </select>
                         &nbsp;<span class='error'><?php echo
-                        $errors['task_status']; ?></span>
+                        $errors['task:status']; ?></span>
                     </div>
                 </td>
             </tr>
@@ -454,7 +454,7 @@ else
                 <td>
                     <div><?php echo __('Status');?>
                         <span class="faded"> - </span>
-                        <select  name="task_status">
+                        <select  name="task:status">
                             <option value="open" <?php
                                 echo $task->isOpen() ?
                                 'selected="selected"': ''; ?>> <?php
@@ -470,7 +470,7 @@ else
                             } ?>
                         </select>
                         &nbsp;<span class='error'><?php echo
-                        $errors['task_status']; ?></span>
+                        $errors['task:status']; ?></span>
                     </div>
                 </td>
             </tr>