diff --git a/include/class.task.php b/include/class.task.php
index 55671d1af58b9ac43cb9939bd94ecaf5b95f8df7..a9e07584e03a06209ad730b5a366177922355225 100644
--- a/include/class.task.php
+++ b/include/class.task.php
@@ -1212,14 +1212,18 @@ class Task extends TaskModel implements RestrictedAccess, Threadable {
 
         // Get role for the dept
         $role = $thisstaff->getRole($task->dept_id);
-
         // Assignment
-        if ($vars['internal_formdata']['assignee']
+        $assignee = $vars['internal_formdata']['assignee'];
+        if ($assignee
                 // skip assignment if the user doesn't have perm.
                 && $role->hasPerm(Task::PERM_ASSIGN)) {
             $_errors = array();
-            $form = AssignmentForm::instantiate(array(
-                        'assignee' => $vars['internal_formdata']['assignee']));
+            $assigneeId = sprintf('%s%d',
+                    ($assignee  instanceof Staff) ? 's' : 't',
+                    $assignee->getId());
+
+            $form = AssignmentForm::instantiate(array('assignee' => $assigneeId));
+
             $task->assign($form, $_errors);
         }