diff --git a/src/applications/project/controller/PhabricatorProjectMembersViewController.php b/src/applications/project/controller/PhabricatorProjectMembersViewController.php
index cd80d0c724..30ff425a51 100644
--- a/src/applications/project/controller/PhabricatorProjectMembersViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectMembersViewController.php
@@ -1,226 +1,228 @@
 <?php
 
 final class PhabricatorProjectMembersViewController
   extends PhabricatorProjectController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $project = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->needMembers(true)
       ->needWatchers(true)
       ->needImages(true)
       ->executeOne();
     if (!$project) {
       return new Aphront404Response();
     }
 
     $this->setProject($project);
     $title = pht('Members and Watchers');
     $curtain = $this->buildCurtainView($project);
 
     $member_list = id(new PhabricatorProjectMemberListView())
       ->setUser($viewer)
       ->setProject($project)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setUserPHIDs($project->getMemberPHIDs());
+      ->setUserPHIDs($project->getMemberPHIDs())
+      ->setShowNote(true);
 
     $watcher_list = id(new PhabricatorProjectWatcherListView())
       ->setUser($viewer)
       ->setProject($project)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setUserPHIDs($project->getWatcherPHIDs());
+      ->setUserPHIDs($project->getWatcherPHIDs())
+      ->setShowNote(true);
 
     $nav = $this->getProfileMenu();
     $nav->selectFilter(PhabricatorProject::ITEM_MEMBERS);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Members'));
     $crumbs->setBorder(true);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setHeaderIcon('fa-group');
 
     require_celerity_resource('project-view-css');
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setCurtain($curtain)
       ->addClass('project-view-home')
       ->addClass('project-view-people-home')
       ->setMainColumn(array(
         $member_list,
         $watcher_list,
       ));
 
     return $this->newPage()
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->setTitle(array($project->getName(), $title))
       ->appendChild($view);
   }
 
   private function buildCurtainView(PhabricatorProject $project) {
     $viewer = $this->getViewer();
     $id = $project->getID();
 
     $curtain = $this->newCurtainView($project);
 
     $is_locked = $project->getIsMembershipLocked();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $project,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $supports_edit = $project->supportsEditMembers();
 
     $can_join = $supports_edit && PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $project,
       PhabricatorPolicyCapability::CAN_JOIN);
 
     $can_leave = $supports_edit && (!$is_locked || $can_edit);
 
     $viewer_phid = $viewer->getPHID();
 
     if (!$project->isUserMember($viewer_phid)) {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setHref('/project/update/'.$project->getID().'/join/')
           ->setIcon('fa-plus')
           ->setDisabled(!$can_join)
           ->setWorkflow(true)
           ->setName(pht('Join Project')));
     } else {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setHref('/project/update/'.$project->getID().'/leave/')
           ->setIcon('fa-times')
           ->setDisabled(!$can_leave)
           ->setWorkflow(true)
           ->setName(pht('Leave Project')));
     }
 
     if (!$project->isUserWatcher($viewer->getPHID())) {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setWorkflow(true)
           ->setHref('/project/watch/'.$project->getID().'/')
           ->setIcon('fa-eye')
           ->setName(pht('Watch Project')));
     } else {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setWorkflow(true)
           ->setHref('/project/unwatch/'.$project->getID().'/')
           ->setIcon('fa-eye-slash')
           ->setName(pht('Unwatch Project')));
     }
 
     $can_silence = $project->isUserMember($viewer_phid);
     $is_silenced = $this->isProjectSilenced($project);
 
     if ($is_silenced) {
       $silence_text = pht('Enable Mail');
     } else {
       $silence_text = pht('Disable Mail');
     }
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName($silence_text)
         ->setIcon('fa-envelope-o')
         ->setHref("/project/silence/{$id}/")
         ->setWorkflow(true)
         ->setDisabled(!$can_silence));
 
     $can_add = $can_edit && $supports_edit;
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Add Members'))
         ->setIcon('fa-user-plus')
         ->setHref("/project/members/{$id}/add/")
         ->setWorkflow(true)
         ->setDisabled(!$can_add));
 
     $can_lock = $can_edit && $supports_edit && $this->hasApplicationCapability(
       ProjectCanLockProjectsCapability::CAPABILITY);
 
     if ($is_locked) {
       $lock_name = pht('Unlock Project');
       $lock_icon = 'fa-unlock';
     } else {
       $lock_name = pht('Lock Project');
       $lock_icon = 'fa-lock';
     }
 
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName($lock_name)
         ->setIcon($lock_icon)
         ->setHref($this->getApplicationURI("lock/{$id}/"))
         ->setDisabled(!$can_lock)
         ->setWorkflow(true));
 
     if ($project->isMilestone()) {
       $icon_key = PhabricatorProjectIconSet::getMilestoneIconKey();
       $header = PhabricatorProjectIconSet::getIconName($icon_key);
       $note = pht(
         'Members of the parent project are members of this project.');
       $show_join = false;
     } else if ($project->getHasSubprojects()) {
       $header = pht('Parent Project');
       $note = pht(
         'Members of all subprojects are members of this project.');
       $show_join = false;
     } else if ($project->getIsMembershipLocked()) {
       $header = pht('Locked Project');
       $note = pht(
         'Users with access may join this project, but may not leave.');
       $show_join = true;
     } else {
       $header = pht('Normal Project');
       $note = pht('Users with access may join and leave this project.');
       $show_join = true;
     }
 
     $curtain->newPanel()
       ->setHeaderText($header)
       ->appendChild($note);
 
     if ($show_join) {
       $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
         $viewer,
         $project);
 
       $curtain->newPanel()
         ->setHeaderText(pht('Joinable By'))
         ->appendChild($descriptions[PhabricatorPolicyCapability::CAN_JOIN]);
     }
 
     return $curtain;
   }
 
   private function isProjectSilenced(PhabricatorProject $project) {
     $viewer = $this->getViewer();
 
     $viewer_phid = $viewer->getPHID();
     if (!$viewer_phid) {
       return false;
     }
 
     $edge_type = PhabricatorProjectSilencedEdgeType::EDGECONST;
     $silenced = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $project->getPHID(),
       $edge_type);
     $silenced = array_fuse($silenced);
     return isset($silenced[$viewer_phid]);
   }
 
 }
diff --git a/src/applications/project/view/PhabricatorProjectUserListView.php b/src/applications/project/view/PhabricatorProjectUserListView.php
index 0c0e2c1d2b..51c2ced6d1 100644
--- a/src/applications/project/view/PhabricatorProjectUserListView.php
+++ b/src/applications/project/view/PhabricatorProjectUserListView.php
@@ -1,153 +1,161 @@
 <?php
 
 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();
     $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);
     }
 
     $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;
 
     if ($limit) {
       $render_phids = array_slice($user_phids, 0, $limit);
     } else {
       $render_phids = $user_phids;
     }
 
     foreach ($render_phids as $user_phid) {
       $handle = $handles[$user_phid];
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($handle->getFullName())
         ->setHref($handle->getURI())
         ->setImageURI($handle->getImageURI());
 
       $icon = id(new PHUIIconView())
         ->setIcon($handle->getIcon());
 
       $subtitle = $handle->getSubtitle();
 
       $item->addAttribute(array($icon, ' ', $subtitle));
 
       if ($can_edit && !$limit) {
         $remove_uri = $this->getRemoveURI($user_phid);
 
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-times')
             ->setName(pht('Remove'))
             ->setHref($remove_uri)
             ->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}/"));
     }
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setObjectList($list);
 
-    if ($this->getMembershipNote()) {
-      $info = id(new PHUIInfoView())
-      ->setSeverity(PHUIInfoView::SEVERITY_PLAIN)
-      ->appendChild($this->getMembershipNote());
-      $box->setInfoView($info);
+    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;
   }
 
 }