diff --git a/module/project/control.php b/module/project/control.php
index 69c35e5fc5..0572c2ab96 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1756,13 +1756,15 @@ class project extends control
      * AJAX: get team members of the project.
      *
      * @param  int    $projectID
+     * @param  string $assignedTo
      * @access public
      * @return void
      */
-    public function ajaxGetMembers($projectID)
+    public function ajaxGetMembers($projectID, $assignedTo = '')
     {
-        $users = $this->project->getTeamMemberPairs($projectID);
-        die(html::select('assignedTo', $users, '', "class='form-control'"));
+        $users      = $this->project->getTeamMemberPairs($projectID);
+        $assignedTo = isset($users[$assignedTo]) ? $assignedTo : '';
+        die(html::select('assignedTo', $users, $assignedTo, "class='form-control'"));
     }
 
     /**
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index b5273ce752..6ed08f4209 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -61,7 +61,7 @@ function loadProjectStories(projectID)
  */
 function loadProjectMembers(projectID)
 {
-    link = createLink('project', 'ajaxGetMembers', 'projectID=' + projectID);
+    link = createLink('project', 'ajaxGetMembers', 'projectID=' + projectID + '&assignedTo=' + oldAssignedTo);
     $('#assignedToIdBox').load(link, function(){$('#assignedToIdBox').find('select').chosen(defaultChosenOptions)});
 }
 
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 25ef6d73a9..d37227c54c 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('oldStoryID', $task->story); ?>
+<?php js::set('oldAssignedTo', $task->assignedTo); ?>
 <?php js::set('confirmChangeProject', $lang->task->confirmChangeProject); ?>
 <?php js::set('changeProjectConfirmed', false); ?>
 <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>