diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index ffa3b0c4f7..3733a8fbbb 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -85,7 +85,7 @@
       </tr>
       <tr>
         <th><?php echo $lang->task->mailto;?></th>
-        <td colspan='2'><?php echo html::select('mailto[]', $members, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?></td>
+        <td colspan='2'><?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?></td>
         <td class='text-top'><?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\"");?></td>
       </tr>
       <tr>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 9a37a1e7fa..c675d5351d 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -89,7 +89,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->mailto;?></th>
-            <td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?></td>
+            <td><?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?></td>
           </tr>
         </table>
       </fieldset>