diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 386a649238..54e1d77d55 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -1,334 +1,334 @@
 <?php
 
 final class PhabricatorProjectProfileController
   extends PhabricatorProjectController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $response = $this->loadProject();
     if ($response) {
       return $response;
     }
 
     $viewer = $request->getUser();
     $project = $this->getProject();
     $id = $project->getID();
     $picture = $project->getProfileImageURI();
     $icon = $project->getDisplayIconIcon();
     $icon_name = $project->getDisplayIconName();
     $tag = id(new PHUITagView())
       ->setIcon($icon)
       ->setName($icon_name)
       ->addClass('project-view-header-tag')
       ->setType(PHUITagView::TYPE_SHADE);
 
     $header = id(new PHUIHeaderView())
       ->setHeader(array($project->getDisplayName(), $tag))
       ->setUser($viewer)
       ->setPolicyObject($project)
       ->setProfileHeader(true);
 
     if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
     } else {
       $header->setStatus('fa-ban', 'red', pht('Archived'));
     }
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $project,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     if ($can_edit) {
       $header->setImageEditURL($this->getApplicationURI("picture/{$id}/"));
     }
 
     $properties = $this->buildPropertyListView($project);
 
     $watch_action = $this->renderWatchAction($project);
     $header->addActionLink($watch_action);
 
     $subtype = $project->newSubtypeObject();
     if ($subtype && $subtype->hasTagView()) {
       $subtype_tag = $subtype->newTagView();
       $header->addTag($subtype_tag);
     }
 
     $milestone_list = $this->buildMilestoneList($project);
     $subproject_list = $this->buildSubprojectList($project);
 
     $member_list = id(new PhabricatorProjectMemberListView())
       ->setUser($viewer)
       ->setProject($project)
-      ->setLimit(5)
+      ->setLimit(10)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setUserPHIDs($project->getMemberPHIDs());
 
     $watcher_list = id(new PhabricatorProjectWatcherListView())
       ->setUser($viewer)
       ->setProject($project)
-      ->setLimit(5)
+      ->setLimit(10)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setUserPHIDs($project->getWatcherPHIDs());
 
     $nav = $this->newNavigation(
       $project,
       PhabricatorProject::ITEM_PROFILE);
 
     $query = id(new PhabricatorFeedQuery())
       ->setViewer($viewer)
       ->withFilterPHIDs(array($project->getPHID()))
       ->setLimit(50)
       ->setReturnPartialResultsOnOverheat(true);
 
     $stories = $query->execute();
 
     $overheated_view = null;
     $is_overheated = $query->getIsOverheated();
     if ($is_overheated) {
       $overheated_message =
         PhabricatorApplicationSearchController::newOverheatedError(
           (bool)$stories);
 
       $overheated_view = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
         ->setTitle(pht('Query Overheated'))
         ->setErrors(
           array(
             $overheated_message,
           ));
     }
 
     $view_all = id(new PHUIButtonView())
       ->setTag('a')
       ->setIcon(
         id(new PHUIIconView())
           ->setIcon('fa-list-ul'))
       ->setText(pht('View All'))
       ->setHref('/feed/?projectPHIDs='.$project->getPHID());
 
     $feed_header = id(new PHUIHeaderView())
       ->setHeader(pht('Recent Activity'))
       ->addActionLink($view_all);
 
     $feed = $this->renderStories($stories);
     $feed = id(new PHUIObjectBoxView())
       ->setHeader($feed_header)
       ->addClass('project-view-feed')
       ->appendChild(
         array(
           $overheated_view,
           $feed,
         ));
 
     require_celerity_resource('project-view-css');
 
     $home = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->addClass('project-view-home')
       ->addClass('project-view-people-home')
       ->setMainColumn(
         array(
           $properties,
           $feed,
         ))
       ->setSideColumn(
         array(
           $milestone_list,
           $subproject_list,
           $member_list,
           $watcher_list,
         ));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setBorder(true);
 
     return $this->newPage()
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->setTitle($project->getDisplayName())
       ->setPageObjectPHIDs(array($project->getPHID()))
       ->appendChild($home);
   }
 
   private function buildPropertyListView(
     PhabricatorProject $project) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($project);
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $project,
       PhabricatorCustomField::ROLE_VIEW);
     $field_list->appendFieldsToPropertyList($project, $viewer, $view);
 
     if (!$view->hasAnyProperties()) {
       return null;
     }
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Details'));
 
     $view = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($view)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->addClass('project-view-properties');
 
     return $view;
   }
 
   private function renderStories(array $stories) {
     assert_instances_of($stories, 'PhabricatorFeedStory');
 
     $builder = new PhabricatorFeedBuilder($stories);
     $builder->setUser($this->getRequest()->getUser());
     $builder->setShowHovercards(true);
     $view = $builder->buildView();
 
     return $view;
   }
 
   private function renderWatchAction(PhabricatorProject $project) {
     $viewer = $this->getViewer();
     $id = $project->getID();
 
     if (!$viewer->isLoggedIn()) {
       $is_watcher = false;
       $is_ancestor = false;
     } else {
       $viewer_phid = $viewer->getPHID();
       $is_watcher = $project->isUserWatcher($viewer_phid);
       $is_ancestor = $project->isUserAncestorWatcher($viewer_phid);
     }
 
     if ($is_ancestor && !$is_watcher) {
       $watch_icon = 'fa-eye';
       $watch_text = pht('Watching Ancestor');
       $watch_href = "/project/watch/{$id}/?via=profile";
       $watch_disabled = true;
     } else if (!$is_watcher) {
       $watch_icon = 'fa-eye';
       $watch_text = pht('Watch Project');
       $watch_href = "/project/watch/{$id}/?via=profile";
       $watch_disabled = false;
     } else {
       $watch_icon = 'fa-eye-slash';
       $watch_text = pht('Unwatch Project');
       $watch_href = "/project/unwatch/{$id}/?via=profile";
       $watch_disabled = false;
     }
 
     $watch_icon = id(new PHUIIconView())
       ->setIcon($watch_icon);
 
     return id(new PHUIButtonView())
       ->setTag('a')
       ->setWorkflow(true)
       ->setIcon($watch_icon)
       ->setText($watch_text)
       ->setHref($watch_href)
       ->setDisabled($watch_disabled);
   }
 
   private function buildMilestoneList(PhabricatorProject $project) {
     if (!$project->getHasMilestones()) {
       return null;
     }
 
     $viewer = $this->getViewer();
     $id = $project->getID();
 
     $milestones = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->withParentProjectPHIDs(array($project->getPHID()))
       ->needImages(true)
       ->withIsMilestone(true)
       ->withStatuses(
         array(
           PhabricatorProjectStatus::STATUS_ACTIVE,
         ))
       ->setOrderVector(array('milestoneNumber', 'id'))
       ->execute();
     if (!$milestones) {
       return null;
     }
 
     $milestone_list = id(new PhabricatorProjectListView())
       ->setUser($viewer)
       ->setProjects($milestones)
       ->renderList();
 
     $view_all = id(new PHUIButtonView())
       ->setTag('a')
       ->setIcon(
         id(new PHUIIconView())
           ->setIcon('fa-list-ul'))
       ->setText(pht('View All'))
       ->setHref("/project/subprojects/{$id}/");
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Milestones'))
       ->addActionLink($view_all);
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setObjectList($milestone_list);
   }
 
   private function buildSubprojectList(PhabricatorProject $project) {
     if (!$project->getHasSubprojects()) {
       return null;
     }
 
     $viewer = $this->getViewer();
     $id = $project->getID();
 
     $limit = 25;
 
     $subprojects = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->withParentProjectPHIDs(array($project->getPHID()))
       ->needImages(true)
       ->withStatuses(
         array(
           PhabricatorProjectStatus::STATUS_ACTIVE,
         ))
       ->withIsMilestone(false)
       ->setLimit($limit)
       ->execute();
     if (!$subprojects) {
       return null;
     }
 
     $subproject_list = id(new PhabricatorProjectListView())
       ->setUser($viewer)
       ->setProjects($subprojects)
       ->renderList();
 
     $view_all = id(new PHUIButtonView())
       ->setTag('a')
       ->setIcon(
         id(new PHUIIconView())
           ->setIcon('fa-list-ul'))
       ->setText(pht('View All'))
       ->setHref("/project/subprojects/{$id}/");
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Subprojects'))
       ->addActionLink($view_all);
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setObjectList($subproject_list);
   }
 
 }
diff --git a/src/applications/project/view/PhabricatorProjectUserListView.php b/src/applications/project/view/PhabricatorProjectUserListView.php
index 51c2ced6d1..dd3e084c6e 100644
--- a/src/applications/project/view/PhabricatorProjectUserListView.php
+++ b/src/applications/project/view/PhabricatorProjectUserListView.php
@@ -1,161 +1,183 @@
 <?php
 
-abstract class PhabricatorProjectUserListView extends AphrontView {
+abstract class PhabricatorProjectUserListView
+  extends AphrontView {
 
   private $project;
   private $userPHIDs;
   private $limit;
   private $background;
   private $showNote;
 
   public function setProject(PhabricatorProject $project) {
     $this->project = $project;
     return $this;
   }
 
   public function getProject() {
     return $this->project;
   }
 
   public function setUserPHIDs(array $user_phids) {
     $this->userPHIDs = $user_phids;
     return $this;
   }
 
   public function getUserPHIDs() {
     return $this->userPHIDs;
   }
 
   public function setLimit($limit) {
     $this->limit = $limit;
     return $this;
   }
 
   public function getLimit() {
     return $this->limit;
   }
 
   public function setBackground($color) {
     $this->background = $color;
     return $this;
   }
 
   public function setShowNote($show) {
     $this->showNote = $show;
     return $this;
   }
 
   abstract protected function canEditList();
   abstract protected function getNoDataString();
   abstract protected function getRemoveURI($phid);
   abstract protected function getHeaderText();
   abstract protected function getMembershipNote();
 
   public function render() {
     $viewer = $this->getViewer();
     $project = $this->getProject();
     $user_phids = $this->getUserPHIDs();
 
     $can_edit = $this->canEditList();
+    $supports_edit = $project->supportsEditMembers();
     $no_data = $this->getNoDataString();
 
     $list = id(new PHUIObjectItemListView())
       ->setNoDataString($no_data);
 
     $limit = $this->getLimit();
-
-    // If we're showing everything, show oldest to newest. If we're showing
-    // only a slice, show newest to oldest.
-    if (!$limit) {
-      $user_phids = array_reverse($user_phids);
-    }
+    $is_panel = (bool)$limit;
 
     $handles = $viewer->loadHandles($user_phids);
 
-    // Always put the viewer first if they are on the list.
-    $user_phids = array_fuse($user_phids);
-    $user_phids =
-      array_select_keys($user_phids, array($viewer->getPHID())) +
-      $user_phids;
+    // Reorder users in display order. We're going to put the viewer first
+    // if they're a member, then enabled users, then disabled/invalid users.
 
-    if ($limit) {
-      $render_phids = array_slice($user_phids, 0, $limit);
-    } else {
-      $render_phids = $user_phids;
+    $phid_map = array();
+    foreach ($user_phids as $user_phid) {
+      $handle = $handles[$user_phid];
+
+      $is_viewer = ($user_phid === $viewer->getPHID());
+      $is_enabled = ($handle->isComplete() && !$handle->isDisabled());
+
+      // If we're showing the main member list, show oldest to newest. If we're
+      // showing only a slice in a panel, show newest to oldest.
+      if ($limit) {
+        $order_scalar = 1;
+      } else {
+        $order_scalar = -1;
+      }
+
+      $phid_map[$user_phid] = id(new PhutilSortVector())
+        ->addInt($is_viewer ? 0 : 1)
+        ->addInt($is_enabled ? 0 : 1)
+        ->addInt($order_scalar * count($phid_map));
     }
+    $phid_map = msortv($phid_map, 'getSelf');
 
-    foreach ($render_phids as $user_phid) {
-      $handle = $handles[$user_phid];
+    $handles = iterator_to_array($handles);
+    $handles = array_select_keys($handles, array_keys($phid_map));
 
+    if ($limit) {
+      $handles = array_slice($handles, 0, $limit);
+    }
+
+    foreach ($handles as $user_phid => $handle) {
       $item = id(new PHUIObjectItemView())
         ->setHeader($handle->getFullName())
         ->setHref($handle->getURI())
         ->setImageURI($handle->getImageURI());
 
-      $icon = id(new PHUIIconView())
-        ->setIcon($handle->getIcon());
+      if ($handle->isDisabled()) {
+        if ($is_panel) {
+          // Don't show disabled users in the panel view at all.
+          continue;
+        }
+
+        $item
+          ->setDisabled(true)
+          ->addAttribute(pht('Disabled'));
+      } else {
+        $icon = id(new PHUIIconView())
+          ->setIcon($handle->getIcon());
 
-      $subtitle = $handle->getSubtitle();
+        $subtitle = $handle->getSubtitle();
 
-      $item->addAttribute(array($icon, ' ', $subtitle));
+        $item->addAttribute(array($icon, ' ', $subtitle));
+      }
 
-      if ($can_edit && !$limit) {
+      if ($supports_edit && !$is_panel) {
         $remove_uri = $this->getRemoveURI($user_phid);
 
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-times')
             ->setName(pht('Remove'))
             ->setHref($remove_uri)
+            ->setDisabled(!$can_edit)
             ->setWorkflow(true));
       }
 
       $list->addItem($item);
     }
 
     if ($user_phids) {
       $header_text = pht(
         '%s (%s)',
         $this->getHeaderText(),
         phutil_count($user_phids));
     } else {
       $header_text = $this->getHeaderText();
     }
 
     $id = $project->getID();
 
     $header = id(new PHUIHeaderView())
       ->setHeader($header_text);
 
     if ($limit) {
-      $header->addActionLink(
-        id(new PHUIButtonView())
-          ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIcon('fa-list-ul'))
-          ->setText(pht('View All'))
-          ->setHref("/project/members/{$id}/"));
+      $list->newTailButton()
+        ->setText(pht('View All'))
+        ->setHref("/project/members/{$id}/");
     }
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setObjectList($list);
 
     if ($this->showNote) {
       if ($this->getMembershipNote()) {
         $info = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_PLAIN)
         ->appendChild($this->getMembershipNote());
         $box->setInfoView($info);
       }
     }
 
     if ($this->background) {
       $box->setBackground($this->background);
     }
 
     return $box;
   }
 
 }