diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index eafe4c02a..9134860fd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -410,8 +410,8 @@ public class EditPeopleControlSet extends PopupControlSet {
                     int taskRabbitIndex = addUnassigned ? 3 : 2;
                     if (!addContactPicker)
                         taskRabbitIndex--;
-                    coreUsers.add(taskRabbitIndex, taskRabbitUser);
                     if(l.didPostToTaskRabbit()){
+                        coreUsers.add(taskRabbitIndex, taskRabbitUser);
                         assignedIndex = taskRabbitIndex;
                     }
                 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
index c071c7193..8e864eab2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@@ -321,6 +321,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         updater.onCreateTask(list, getFilter(), task.getId());
         fragment.reconstructCursor();
         fragment.loadTaskListContent(true);
+        fragment.selectCustomId(task.getId());
     }
 
     public void onDeleteTask(Task task) {