diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 96afeeee40..fdd384c8f1 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -341,7 +341,7 @@ function loadExecutionRelated(executionID)
         loadExecutionTasks(executionID);
         loadExecutionStories(executionID);
         loadExecutionBuilds(executionID);
-        loadAssignedTo(executionID);
+        loadAssignedTo(executionID, $('#assignedTo').val());
         loadTestTasks($('#product').val(), executionID);
     }
     else
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 4872fc2ac6..5b6a8e5805 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -145,7 +145,12 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->assignedTo;?></th>
-                  <td><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
+                  <td>
+                    <div class='input-group'>
+                      <?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?>
+                      <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
+                    </div>
+                  </td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->deadline;?></th>