diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php
index 6af9d69492..5be803b895 100644
--- a/src/applications/auth/controller/config/PhabricatorAuthListController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php
@@ -1,187 +1,190 @@
 <?php
 
 final class PhabricatorAuthListController
   extends PhabricatorAuthProviderConfigController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $configs = id(new PhabricatorAuthProviderConfigQuery())
       ->setViewer($viewer)
       ->execute();
 
     $list = new PHUIObjectItemListView();
+    $can_manage = $this->hasApplicationCapability(
+        AuthManageProvidersCapability::CAPABILITY);
 
     foreach ($configs as $config) {
       $item = new PHUIObjectItemView();
 
       $id = $config->getID();
 
       $edit_uri = $this->getApplicationURI('config/edit/'.$id.'/');
       $enable_uri = $this->getApplicationURI('config/enable/'.$id.'/');
       $disable_uri = $this->getApplicationURI('config/disable/'.$id.'/');
 
       $provider = $config->getProvider();
       if ($provider) {
         $name = $provider->getProviderName();
       } else {
         $name = $config->getProviderType().' ('.$config->getProviderClass().')';
       }
 
       $item->setHeader($name);
 
       if ($provider) {
         $item->setHref($edit_uri);
       } else {
         $item->addAttribute(pht('Provider Implementation Missing!'));
       }
 
       $domain = null;
       if ($provider) {
         $domain = $provider->getProviderDomain();
         if ($domain !== 'self') {
           $item->addAttribute($domain);
         }
       }
 
       if ($config->getShouldAllowRegistration()) {
         $item->addAttribute(pht('Allows Registration'));
+      } else {
+        $item->addAttribute(pht('Does Not Allow Registration'));
       }
 
-      $can_manage = $this->hasApplicationCapability(
-        AuthManageProvidersCapability::CAPABILITY);
       if ($config->getIsEnabled()) {
         $item->setState(PHUIObjectItemView::STATE_SUCCESS);
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-times')
             ->setHref($disable_uri)
             ->setDisabled(!$can_manage)
             ->addSigil('workflow'));
       } else {
         $item->setState(PHUIObjectItemView::STATE_FAIL);
         $item->addIcon('fa-times grey', pht('Disabled'));
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-plus')
             ->setHref($enable_uri)
             ->setDisabled(!$can_manage)
             ->addSigil('workflow'));
       }
 
       $list->addItem($item);
     }
 
     $list->setNoDataString(
       pht(
         '%s You have not added authentication providers yet. Use "%s" to add '.
         'a provider, which will let users register new Phabricator accounts '.
         'and log in.',
         phutil_tag(
           'strong',
           array(),
           pht('No Providers Configured:')),
         phutil_tag(
           'a',
           array(
             'href' => $this->getApplicationURI('config/new/'),
           ),
           pht('Add Authentication Provider'))));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Auth Providers'));
 
     $domains_key = 'auth.email-domains';
     $domains_link = $this->renderConfigLink($domains_key);
     $domains_value = PhabricatorEnv::getEnvConfig($domains_key);
 
     $approval_key = 'auth.require-approval';
     $approval_link = $this->renderConfigLink($approval_key);
     $approval_value = PhabricatorEnv::getEnvConfig($approval_key);
 
     $issues = array();
     if ($domains_value) {
       $issues[] = pht(
         'Phabricator is configured with an email domain whitelist (in %s), so '.
         'only users with a verified email address at one of these %s '.
         'allowed domain(s) will be able to register an account: %s',
         $domains_link,
         new PhutilNumber(count($domains_value)),
         phutil_tag('strong', array(), implode(', ', $domains_value)));
     } else {
       $issues[] = pht(
         'Anyone who can browse to this Phabricator install will be able to '.
         'register an account. To add email domain restrictions, configure '.
         '%s.',
         $domains_link);
     }
 
     if ($approval_value) {
       $issues[] = pht(
         'Administrative approvals are enabled (in %s), so all new users must '.
         'have their accounts approved by an administrator.',
         $approval_link);
     } else {
       $issues[] = pht(
         'Administrative approvals are disabled, so users who register will '.
         'be able to use their accounts immediately. To enable approvals, '.
         'configure %s.',
         $approval_link);
     }
 
     if (!$domains_value && !$approval_value) {
       $severity = PHUIInfoView::SEVERITY_WARNING;
       $issues[] = pht(
         'You can safely ignore this warning if the install itself has '.
         'access controls (for example, it is deployed on a VPN) or if all of '.
         'the configured providers have access controls (for example, they are '.
         'all private LDAP or OAuth servers).');
     } else {
       $severity = PHUIInfoView::SEVERITY_NOTICE;
     }
 
     $warning = id(new PHUIInfoView())
       ->setSeverity($severity)
       ->setErrors($issues);
 
     $image = id(new PHUIIconView())
           ->setIconFont('fa-plus');
     $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setHref($this->getApplicationURI('config/new/'))
         ->setIcon($image)
+        ->setDisabled(!$can_manage)
         ->setText(pht('Add Provider'));
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Authentication Providers'))
       ->addActionLink($button);
 
     $list->setFlush(true);
     $list = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setInfoView($warning)
       ->appendChild($list);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $list,
       ),
       array(
         'title' => pht('Authentication Providers'),
       ));
   }
 
   private function renderConfigLink($key) {
     return phutil_tag(
       'a',
       array(
         'href' => '/config/edit/'.$key.'/',
         'target' => '_blank',
       ),
       $key);
   }
 
 }