diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php
index adcb9ad492..6d3f09d48c 100644
--- a/src/applications/auth/controller/config/PhabricatorAuthListController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php
@@ -1,97 +1,105 @@
 <?php
 
 final class PhabricatorAuthListController
   extends PhabricatorAuthProviderConfigController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $configs = id(new PhabricatorAuthProviderConfigQuery())
       ->setViewer($viewer)
       ->execute();
 
     $list = new PhabricatorObjectItemListView();
     foreach ($configs as $config) {
       $item = new PhabricatorObjectItemView();
 
       $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();
+        $name = $config->getProviderType().' ('.$config->getProviderClass().')';
       }
 
       $item
-        ->setHeader($name)
-        ->setHref($edit_uri);
+        ->setHeader($name);
 
-      $domain = $provider->getProviderDomain();
-      if ($domain !== 'self') {
-        $item->addAttribute($domain);
+      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'));
       }
 
       if ($config->getIsEnabled()) {
         $item->setBarColor('green');
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('delete')
             ->setHref($disable_uri)
             ->addSigil('workflow'));
       } else {
         $item->setBarColor('grey');
         $item->addIcon('delete-grey', pht('Disabled'));
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('new')
             ->setHref($enable_uri)
             ->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->addCrumb(
       id(new PhabricatorCrumbView())
         ->setName(pht('Auth Providers')));
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $list,
       ),
       array(
         'title' => pht('Authentication Providers'),
         'dust' => true,
         'device' => true,
       ));
   }
 
 }