diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ba266c91ed..d1761cbce3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2718,26 +2718,26 @@ phutil_register_library_map(array(
     'ConduitAPI_conpherence_updatethread_Method' => 'ConduitAPI_conpherence_Method',
     'ConduitAPI_differential_Method' => 'ConduitAPIMethod',
     'ConduitAPI_differential_close_Method' => 'ConduitAPI_differential_Method',
-    'ConduitAPI_differential_createcomment_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
+    'ConduitAPI_differential_createcomment_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_creatediff_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_createinline_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_createrawdiff_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_createrevision_Method' => 'ConduitAPI_differential_Method',
-    'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_finishpostponedlinters_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_getdiff_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_getrawdiff_Method' => 'ConduitAPIMethod',
+    'ConduitAPI_differential_find_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_finishpostponedlinters_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_getdiff_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_getrawdiff_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_getrevision_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_getrevisioncomments_Method' => 'ConduitAPI_differential_Method',
-    'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPIMethod',
+    'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_query_Method' => 'ConduitAPI_differential_Method',
-    'ConduitAPI_differential_querydiffs_Method' => 'ConduitAPIMethod',
-    'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
+    'ConduitAPI_differential_querydiffs_Method' => 'ConduitAPI_differential_Method',
+    'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPI_differential_Method',
-    'ConduitAPI_differential_updateunitresults_Method' => 'ConduitAPIMethod',
+    'ConduitAPI_differential_updateunitresults_Method' => 'ConduitAPI_differential_Method',
     'ConduitAPI_diffusion_Method' => 'ConduitAPIMethod',
     'ConduitAPI_diffusion_abstractquery_Method' => 'ConduitAPI_diffusion_Method',
     'ConduitAPI_diffusion_branchquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
index e6d8d975c3..cc4f752223 100644
--- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
@@ -1,13 +1,14 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitConsoleController
   extends PhabricatorConduitController {
 
   private $method;
 
+  public function shouldAllowPublic() {
+    return true;
+  }
+
   public function willProcessRequest(array $data) {
     $this->method = $data['method'];
   }
@@ -26,28 +27,25 @@ final class PhabricatorConduitConsoleController
       return new Aphront404Response();
     }
 
+    $can_call_method = false;
+
     $status = $method->getMethodStatus();
     $reason = $method->getMethodStatusDescription();
+    $errors = array();
 
-    $status_view = null;
-    if ($status != ConduitAPIMethod::METHOD_STATUS_STABLE) {
-      $status_view = new AphrontErrorView();
-      switch ($status) {
-        case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
-          $status_view->setTitle('Deprecated Method');
-          $status_view->appendChild(
-            nonempty($reason, "This method is deprecated."));
-          break;
-        case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
-          $status_view->setSeverity(AphrontErrorView::SEVERITY_WARNING);
-          $status_view->setTitle('Unstable Method');
-          $status_view->appendChild(
-            nonempty(
-              $reason,
-              "This method is new and unstable. Its interface is subject ".
-              "to change."));
-          break;
-      }
+    switch ($status) {
+      case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
+        $reason = nonempty($reason, pht('This method is deprecated.'));
+        $errors[] = pht('Deprecated Method: %s', $reason);
+        break;
+      case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
+        $reason = nonempty(
+          $reason,
+          pht(
+            'This method is new and unstable. Its interface is subject '.
+            'to change.'));
+        $errors[] = pht('Unstable Method: %s', $reason);
+        break;
     }
 
     $error_types = $method->defineErrorTypes();
@@ -61,7 +59,8 @@ final class PhabricatorConduitConsoleController
       }
       $error_description = phutil_tag('ul', array(), $error_description);
     } else {
-      $error_description = "This method does not raise any specific errors.";
+      $error_description = pht(
+        'This method does not raise any specific errors.');
     }
 
     $form = new AphrontFormView();
@@ -95,29 +94,38 @@ final class PhabricatorConduitConsoleController
           ->setCaption($desc));
     }
 
-    $form
-      ->appendChild(
-        id(new AphrontFormSelectControl())
-          ->setLabel('Output Format')
-          ->setName('output')
-          ->setOptions(
-            array(
-              'human' => 'Human Readable',
-              'json'  => 'JSON',
-            )))
-      ->appendChild(
-        id(new AphrontFormSubmitControl())
-          ->addCancelButton($this->getApplicationURI())
-          ->setValue('Call Method'));
+    $must_login = !$viewer->isLoggedIn() &&
+                  $method->shouldRequireAuthentication();
+    if ($must_login) {
+      $errors[] = pht(
+        'Login Required: This method requires authentication. You must '.
+        'log in before you can make calls to it.');
+    } else {
+      $form
+        ->appendChild(
+          id(new AphrontFormSelectControl())
+            ->setLabel('Output Format')
+            ->setName('output')
+            ->setOptions(
+              array(
+                'human' => 'Human Readable',
+                'json'  => 'JSON',
+              )))
+        ->appendChild(
+          id(new AphrontFormSubmitControl())
+            ->addCancelButton($this->getApplicationURI())
+            ->setValue(pht('Call Method')));
+    }
+
+    $header = id(new PHUIHeaderView())
+      ->setUser($viewer)
+      ->setHeader($method->getAPIMethodName());
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($method->getAPIMethodName())
+      ->setHeader($header)
+      ->setFormErrors($errors)
       ->setForm($form);
 
-    if ($status_view) {
-      $form_box->setErrorView($status_view);
-    }
-
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($method->getAPIMethodName());
 
diff --git a/src/applications/conduit/controller/PhabricatorConduitListController.php b/src/applications/conduit/controller/PhabricatorConduitListController.php
index fdf46a0fd0..2d8fd2dab2 100644
--- a/src/applications/conduit/controller/PhabricatorConduitListController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitListController.php
@@ -1,14 +1,15 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitListController
   extends PhabricatorConduitController
   implements PhabricatorApplicationSearchResultsControllerInterface {
 
   private $queryKey;
 
+  public function shouldAllowPublic() {
+    return true;
+  }
+
   public function willProcessRequest(array $data) {
     $this->queryKey = idx($data, 'queryKey');
   }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
index df39032142..726d5171fd 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_createcomment_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return pht("Add a comment to a Differential revision.");
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
index f0b649b227..1b28b071bf 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
@@ -1,6 +1,7 @@
 <?php
 
-final class ConduitAPI_differential_creatediff_Method extends ConduitAPIMethod {
+final class ConduitAPI_differential_creatediff_Method
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return "Create a new Differential diff.";
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
index bd1bf83a66..96478f5a11 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_createinline_Method
   extends ConduitAPI_differential_Method {
 
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
index 648d38ebbd..eff49c60a3 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_createrawdiff_Method
   extends ConduitAPI_differential_Method {
 
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
index c74a37b6bd..bda9a513b4 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
@@ -1,9 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_differential_find_Method extends ConduitAPIMethod {
+final class ConduitAPI_differential_find_Method
+  extends ConduitAPI_differential_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
index f3babde6df..f0117073da 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_finishpostponedlinters_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return "Update diff with new lint messages and mark postponed ".
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
index b67ac232f8..aa3a853120 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_getalldiffs_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_DEPRECATED;
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
index 7b0b7a9511..7fdde3332a 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
@@ -1,7 +1,7 @@
 <?php
 
 final class ConduitAPI_differential_getcommitmessage_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return "Retrieve Differential commit messages or message templates.";
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
index 56e5120ca1..8820b4bea7 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_getcommitpaths_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return "Query which paths should be included when committing a ".
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
index dd5d6e495f..67a68adf2b 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_getdiff_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function shouldAllowPublic() {
     return true;
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
index 99e6515a06..188695c173 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
@@ -1,7 +1,7 @@
 <?php
 
 final class ConduitAPI_differential_getrawdiff_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return pht("Retrieve a raw diff");
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
index ec54f4d55e..b5934997bc 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
@@ -1,7 +1,7 @@
 <?php
 
 final class ConduitAPI_differential_parsecommitmessage_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   private $errors;
 
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php
index 70716afaab..aa25d8ed18 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_querydiffs_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return pht('Query differential diffs which match certain criteria.');
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
index 5464613cff..657f4b2706 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_setdiffproperty_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return "Attach properties to Differential diffs.";
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
index b4463a86bf..be9da87f2d 100644
--- a/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
@@ -1,10 +1,7 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_differential_updateunitresults_Method
-  extends ConduitAPIMethod {
+  extends ConduitAPI_differential_Method {
 
   public function getMethodDescription() {
     return "Update arc unit results for a postponed test.";
diff --git a/src/applications/people/conduit/ConduitAPI_user_Method.php b/src/applications/people/conduit/ConduitAPI_user_Method.php
index e9c12673bb..3e779fcf48 100644
--- a/src/applications/people/conduit/ConduitAPI_user_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_Method.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_user_Method extends ConduitAPIMethod {
 
   public function getApplication() {
diff --git a/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php b/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
index 3938c4be72..224609e7ee 100644
--- a/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
@@ -1,16 +1,20 @@
 <?php
 
-/**
- * @group conduit
- */
-final class ConduitAPI_user_addstatus_Method extends ConduitAPI_user_Method {
+final class ConduitAPI_user_addstatus_Method
+  extends ConduitAPI_user_Method {
 
   public function getMethodStatus() {
-    return self::METHOD_STATUS_UNSTABLE;
+    return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodDescription() {
-    return "Add status information to the logged-in user.";
+    return pht("Add status information to the logged-in user.");
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'Statuses are becoming full-fledged events as part of the '.
+      'Calendar application.');
   }
 
   public function defineParamTypes() {
diff --git a/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php b/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
index 860c3ae971..6a5fa664b3 100644
--- a/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
@@ -1,16 +1,19 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_user_removestatus_Method extends ConduitAPI_user_Method {
 
   public function getMethodStatus() {
-    return self::METHOD_STATUS_UNSTABLE;
+    return self::METHOD_STATUS_DEPRECATED;
   }
 
   public function getMethodDescription() {
-    return "Delete status information of the logged-in user.";
+    return pht("Delete status information of the logged-in user.");
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'Statuses are becoming full-fledged events as part of the '.
+      'Calendar application.');
   }
 
   public function defineParamTypes() {