diff --git a/src/applications/people/controller/PhabricatorPeopleCalendarController.php b/src/applications/people/controller/PhabricatorPeopleCalendarController.php
index 168c1def70..a5e64199c5 100644
--- a/src/applications/people/controller/PhabricatorPeopleCalendarController.php
+++ b/src/applications/people/controller/PhabricatorPeopleCalendarController.php
@@ -1,100 +1,104 @@
 <?php
 
 final class PhabricatorPeopleCalendarController
   extends PhabricatorPeopleController {
 
   private $username;
 
+  public function shouldAllowPublic() {
+    return true;
+  }
+
   public function shouldRequireAdmin() {
     return false;
   }
 
   public function willProcessRequest(array $data) {
     $this->username = idx($data, 'username');
   }
 
   public function processRequest() {
     $viewer = $this->getRequest()->getUser();
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withUsernames(array($this->username))
       ->needProfileImage(true)
       ->executeOne();
 
     if (!$user) {
       return new Aphront404Response();
     }
 
     $picture = $user->getProfileImageURI();
 
     $now     = time();
     $request = $this->getRequest();
     $year_d  = phabricator_format_local_time($now, $user, 'Y');
     $year    = $request->getInt('year', $year_d);
     $month_d = phabricator_format_local_time($now, $user, 'm');
     $month   = $request->getInt('month', $month_d);
     $day   = phabricator_format_local_time($now, $user, 'j');
 
     $start_epoch = strtotime("{$year}-{$month}-01");
     $end_epoch = strtotime("{$year}-{$month}-01 next month");
 
     $statuses = id(new PhabricatorCalendarEventQuery())
       ->setViewer($user)
       ->withInvitedPHIDs(array($user->getPHID()))
       ->withDateRange(
         $start_epoch,
         $end_epoch)
       ->execute();
 
     $start_range_value = AphrontFormDateControlValue::newFromEpoch(
       $user,
       $start_epoch);
     $end_range_value = AphrontFormDateControlValue::newFromEpoch(
       $user,
       $end_epoch);
 
     if ($month == $month_d && $year == $year_d) {
       $month_view = new PHUICalendarMonthView(
         $start_range_value,
         $end_range_value,
         $month,
         $year,
         $day);
     } else {
       $month_view = new PHUICalendarMonthView(
         $start_range_value,
         $end_range_value,
         $month,
         $year);
     }
 
     $month_view->setBrowseURI($request->getRequestURI());
     $month_view->setUser($user);
     $month_view->setImage($picture);
 
     $phids = mpull($statuses, 'getUserPHID');
     $handles = $this->loadViewerHandles($phids);
 
     foreach ($statuses as $status) {
       $event = new AphrontCalendarEventView();
       $event->setEpochRange($status->getDateFrom(), $status->getDateTo());
       $event->setUserPHID($status->getUserPHID());
       $event->setName($status->getName());
       $event->setDescription($status->getDescription());
       $event->setEventID($status->getID());
       $month_view->addEvent($event);
     }
 
     $name = $user->getUsername();
 
     $nav = $this->buildIconNavView($user);
     $nav->selectFilter("{$name}/calendar/");
     $nav->appendChild($month_view);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => pht('Calendar'),
       ));
   }
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
index 2067654ff0..243e0ad764 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -1,210 +1,214 @@
 <?php
 
 final class PhabricatorPeopleProfileController
   extends PhabricatorPeopleController {
 
   private $username;
 
+  public function shouldAllowPublic() {
+    return true;
+  }
+
   public function shouldRequireAdmin() {
     return false;
   }
 
   public function willProcessRequest(array $data) {
     $this->username = idx($data, 'username');
   }
 
   public function processRequest() {
     $viewer = $this->getRequest()->getUser();
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withUsernames(array($this->username))
       ->needProfileImage(true)
       ->needAvailability(true)
       ->executeOne();
     if (!$user) {
       return new Aphront404Response();
     }
 
     $profile = $user->loadUserProfile();
     $username = phutil_escape_uri($user->getUserName());
 
     $picture = $user->getProfileImageURI();
 
     $header = id(new PHUIHeaderView())
       ->setHeader($user->getFullName())
       ->setSubheader($profile->getTitle())
       ->setImage($picture);
 
     $actions = id(new PhabricatorActionListView())
       ->setObject($user)
       ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $user,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
         ->setName(pht('Edit Profile'))
         ->setHref($this->getApplicationURI('editprofile/'.$user->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-picture-o')
         ->setName(pht('Edit Profile Picture'))
         ->setHref($this->getApplicationURI('picture/'.$user->getID().'/'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $class = 'PhabricatorConpherenceApplication';
     if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
       $href = id(new PhutilURI('/conpherence/new/'))
         ->setQueryParam('participant', $user->getPHID());
 
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-comments')
           ->setName(pht('Send Message'))
           ->setWorkflow(true)
           ->setHref($href));
     }
 
     if ($viewer->getIsAdmin()) {
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-wrench')
           ->setName(pht('Edit Settings'))
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit)
           ->setHref('/settings/'.$user->getID().'/'));
 
       if ($user->getIsAdmin()) {
         $empower_icon = 'fa-arrow-circle-o-down';
         $empower_name = pht('Remove Administrator');
       } else {
         $empower_icon = 'fa-arrow-circle-o-up';
         $empower_name = pht('Make Administrator');
       }
 
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon($empower_icon)
           ->setName($empower_name)
           ->setDisabled(($user->getPHID() == $viewer->getPHID()))
           ->setWorkflow(true)
           ->setHref($this->getApplicationURI('empower/'.$user->getID().'/')));
 
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-tag')
           ->setName(pht('Change Username'))
           ->setWorkflow(true)
           ->setHref($this->getApplicationURI('rename/'.$user->getID().'/')));
 
       if ($user->getIsDisabled()) {
         $disable_icon = 'fa-check-circle-o';
         $disable_name = pht('Enable User');
       } else {
         $disable_icon = 'fa-ban';
         $disable_name = pht('Disable User');
       }
 
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon($disable_icon)
           ->setName($disable_name)
           ->setDisabled(($user->getPHID() == $viewer->getPHID()))
           ->setWorkflow(true)
           ->setHref($this->getApplicationURI('disable/'.$user->getID().'/')));
 
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-times')
           ->setName(pht('Delete User'))
           ->setDisabled(($user->getPHID() == $viewer->getPHID()))
           ->setWorkflow(true)
           ->setHref($this->getApplicationURI('delete/'.$user->getID().'/')));
 
       $actions->addAction(
         id(new PhabricatorActionView())
           ->setIcon('fa-envelope')
           ->setName(pht('Send Welcome Email'))
           ->setWorkflow(true)
           ->setHref($this->getApplicationURI('welcome/'.$user->getID().'/')));
     }
 
     $properties = $this->buildPropertyView($user, $actions);
     $name = $user->getUsername();
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($name);
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     $feed = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Recent Activity'))
       ->appendChild($this->buildPeopleFeed($user, $viewer));
 
     $nav = $this->buildIconNavView($user);
     $nav->selectFilter("{$name}/");
     $nav->appendChild($object_box);
     $nav->appendChild($feed);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $user->getUsername(),
       ));
   }
 
   private function buildPropertyView(
     PhabricatorUser $user,
     PhabricatorActionListView $actions) {
 
     $viewer = $this->getRequest()->getUser();
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($user)
       ->setActionList($actions);
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $user,
       PhabricatorCustomField::ROLE_VIEW);
     $field_list->appendFieldsToPropertyList($user, $viewer, $view);
 
     return $view;
   }
 
   private function buildPeopleFeed(
     PhabricatorUser $user,
     $viewer) {
 
     $query = new PhabricatorFeedQuery();
     $query->setFilterPHIDs(
       array(
         $user->getPHID(),
       ));
     $query->setLimit(100);
     $query->setViewer($viewer);
     $stories = $query->execute();
 
     $builder = new PhabricatorFeedBuilder($stories);
     $builder->setUser($viewer);
     $builder->setShowHovercards(true);
     $builder->setNoDataString(pht('To begin on such a grand journey, '.
       'requires but just a single step.'));
     $view = $builder->buildView();
 
     return phutil_tag_div('phabricator-project-feed', $view->render());
 
   }
 
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
index 2cb613e803..65bf9df0d5 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -1,91 +1,101 @@
 <?php
 
 final class PhabricatorPeopleProfileEditController
   extends PhabricatorPeopleController {
 
   private $id;
 
   public function shouldRequireAdmin() {
     return false;
   }
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->id))
       ->needProfileImage(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$user) {
       return new Aphront404Response();
     }
 
     $profile_uri = '/p/'.$user->getUsername().'/';
 
     $field_list = PhabricatorCustomField::getObjectFields(
       $user,
       PhabricatorCustomField::ROLE_EDIT);
     $field_list
       ->setViewer($viewer)
       ->readFieldsFromStorage($user);
 
     $validation_exception = null;
     if ($request->isFormPost()) {
       $xactions = $field_list->buildFieldTransactionsFromRequest(
         new PhabricatorUserTransaction(),
         $request);
 
       $editor = id(new PhabricatorUserProfileEditor())
         ->setActor($viewer)
         ->setContentSource(
           PhabricatorContentSource::newFromRequest($request))
         ->setContinueOnNoEffect(true);
 
       try {
         $editor->applyTransactions($user, $xactions);
         return id(new AphrontRedirectResponse())->setURI($profile_uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
       }
     }
 
     $title = pht('Edit Profile');
 
     $form = id(new AphrontFormView())
       ->setUser($viewer);
 
     $field_list->appendFieldsToForm($form);
-
     $form
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($profile_uri)
           ->setValue(pht('Save Profile')));
 
+    $allow_public = PhabricatorEnv::getEnvConfig('policy.allow-public');
+    $note = null;
+    if ($allow_public) {
+      $note = id(new PHUIInfoView())
+        ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
+        ->appendChild(pht(
+          'Information on user profiles on this install is publicly '.
+          'visible.'));
+    }
+
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Edit Profile'))
+      ->setInfoView($note)
       ->setValidationException($validation_exception)
       ->setForm($form);
 
     $nav = $this->buildIconNavView($user);
     $nav->selectFilter('/');
     $nav->appendChild($form_box);
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $title,
       ));
   }
 }