diff --git a/src/applications/auth/storage/PhabricatorAuthProviderConfig.php b/src/applications/auth/storage/PhabricatorAuthProviderConfig.php
index 6a8bbe1a0d..876a70c2d0 100644
--- a/src/applications/auth/storage/PhabricatorAuthProviderConfig.php
+++ b/src/applications/auth/storage/PhabricatorAuthProviderConfig.php
@@ -1,134 +1,143 @@
 <?php
 
 final class PhabricatorAuthProviderConfig
   extends PhabricatorAuthDAO
   implements
     PhabricatorApplicationTransactionInterface,
     PhabricatorPolicyInterface {
 
   protected $providerClass;
   protected $providerType;
   protected $providerDomain;
 
   protected $isEnabled;
   protected $shouldAllowLogin         = 0;
   protected $shouldAllowRegistration  = 0;
   protected $shouldAllowLink          = 0;
   protected $shouldAllowUnlink        = 0;
   protected $shouldTrustEmails        = 0;
   protected $shouldAutoLogin          = 0;
 
   protected $properties = array();
 
   private $provider;
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorAuthAuthProviderPHIDType::TYPECONST);
   }
 
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'properties' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'isEnabled' => 'bool',
         'providerClass' => 'text128',
         'providerType' => 'text32',
         'providerDomain' => 'text128',
         'shouldAllowLogin' => 'bool',
         'shouldAllowRegistration' => 'bool',
         'shouldAllowLink' => 'bool',
         'shouldAllowUnlink' => 'bool',
         'shouldTrustEmails' => 'bool',
         'shouldAutoLogin' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_provider' => array(
           'columns' => array('providerType', 'providerDomain'),
           'unique' => true,
         ),
         'key_class' => array(
           'columns' => array('providerClass'),
         ),
       ),
     ) + parent::getConfiguration();
   }
 
   public function getProperty($key, $default = null) {
     return idx($this->properties, $key, $default);
   }
 
   public function setProperty($key, $value) {
     $this->properties[$key] = $value;
     return $this;
   }
 
   public function getProvider() {
     if (!$this->provider) {
       $base = PhabricatorAuthProvider::getAllBaseProviders();
       $found = null;
       foreach ($base as $provider) {
         if (get_class($provider) == $this->providerClass) {
           $found = $provider;
           break;
         }
       }
       if ($found) {
         $this->provider = id(clone $found)->attachProviderConfig($this);
       }
     }
     return $this->provider;
   }
 
   public function getURI() {
     return '/auth/config/view/'.$this->getID().'/';
   }
 
   public function getObjectName() {
     return pht('Auth Provider %d', $this->getID());
   }
 
   public function getDisplayName() {
     return $this->getProvider()->getProviderName();
   }
 
+  public function getSortVector() {
+    return id(new PhutilSortVector())
+      ->addString($this->getDisplayName());
+  }
+
+  public function newIconView() {
+    return $this->getProvider()->newIconView();
+  }
+
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
   public function getApplicationTransactionEditor() {
     return new PhabricatorAuthProviderConfigEditor();
   }
 
   public function getApplicationTransactionTemplate() {
     return new PhabricatorAuthProviderConfigTransaction();
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return PhabricatorPolicies::POLICY_USER;
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_ADMIN;
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
 }
diff --git a/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php b/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php
index 1215487208..9401cddbef 100644
--- a/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php
@@ -1,141 +1,154 @@
 <?php
 
 final class PhabricatorExternalAccountsSettingsPanel
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'external';
   }
 
   public function getPanelName() {
     return pht('External Accounts');
   }
 
   public function getPanelMenuIcon() {
     return 'fa-users';
   }
 
   public function getPanelGroupKey() {
     return PhabricatorSettingsAuthenticationPanelGroup::PANELGROUPKEY;
   }
 
   public function processRequest(AphrontRequest $request) {
     $viewer = $request->getUser();
 
     $providers = PhabricatorAuthProvider::getAllProviders();
 
     $accounts = id(new PhabricatorExternalAccountQuery())
       ->setViewer($viewer)
       ->withUserPHIDs(array($viewer->getPHID()))
       ->needImages(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->execute();
 
     $linked_head = pht('Linked Accounts and Authentication');
 
     $linked = id(new PHUIObjectItemListView())
       ->setUser($viewer)
       ->setNoDataString(pht('You have no linked accounts.'));
 
     $login_accounts = 0;
     foreach ($accounts as $account) {
       if ($account->isUsableForLogin()) {
         $login_accounts++;
       }
     }
 
     foreach ($accounts as $account) {
       $item = new PHUIObjectItemView();
 
       $provider = idx($providers, $account->getProviderKey());
       if ($provider) {
         $item->setHeader($provider->getProviderName());
         $can_unlink = $provider->shouldAllowAccountUnlink();
         if (!$can_unlink) {
           $item->addAttribute(pht('Permanently Linked'));
         }
       } else {
         $item->setHeader(
           pht('Unknown Account ("%s")', $account->getProviderKey()));
         $can_unlink = true;
       }
 
       $can_login = $account->isUsableForLogin();
       if (!$can_login) {
         $item->addAttribute(
           pht(
             'Disabled (an administrator has disabled login for this '.
             'account provider).'));
       }
 
       $can_unlink = $can_unlink && (!$can_login || ($login_accounts > 1));
 
       $can_refresh = $provider && $provider->shouldAllowAccountRefresh();
       if ($can_refresh) {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-refresh')
             ->setHref('/auth/refresh/'.$account->getProviderKey().'/'));
       }
 
       $item->addAction(
         id(new PHUIListItemView())
           ->setIcon('fa-times')
           ->setWorkflow(true)
           ->setDisabled(!$can_unlink)
           ->setHref('/auth/unlink/'.$account->getProviderKey().'/'));
 
       if ($provider) {
         $provider->willRenderLinkedAccount($viewer, $item, $account);
       }
 
       $linked->addItem($item);
     }
 
     $linkable_head = pht('Add External Account');
 
     $linkable = id(new PHUIObjectItemListView())
       ->setUser($viewer)
       ->setNoDataString(
         pht('Your account is linked with all available providers.'));
 
     $accounts = mpull($accounts, null, 'getProviderKey');
 
-    $providers = PhabricatorAuthProvider::getAllEnabledProviders();
-    $providers = msort($providers, 'getProviderName');
-    foreach ($providers as $key => $provider) {
-      if (isset($accounts[$key])) {
+    $configs = id(new PhabricatorAuthProviderConfigQuery())
+      ->setViewer($viewer)
+      ->withIsEnabled(true)
+      ->execute();
+    $configs = msort($configs, 'getSortVector');
+
+    foreach ($configs as $config) {
+      $provider = $config->getProvider();
+
+      if (!$provider->shouldAllowAccountLink()) {
         continue;
       }
 
-      if (!$provider->shouldAllowAccountLink()) {
+      // Don't show the user providers they already have linked.
+      $provider_key = $config->getProvider()->getProviderKey();
+      if (isset($accounts[$provider_key])) {
         continue;
       }
 
       $link_uri = '/auth/link/'.$provider->getProviderKey().'/';
 
+      $link_button = id(new PHUIButtonView())
+        ->setTag('a')
+        ->setIcon('fa-link')
+        ->setHref($link_uri)
+        ->setColor(PHUIButtonView::GREY)
+        ->setText(pht('Link External Account'));
+
       $item = id(new PHUIObjectItemView())
-        ->setHeader($provider->getProviderName())
+        ->setHeader($config->getDisplayName())
         ->setHref($link_uri)
-        ->addAction(
-          id(new PHUIListItemView())
-            ->setIcon('fa-link')
-            ->setHref($link_uri));
+        ->setImageIcon($config->newIconView())
+        ->setSideColumn($link_button);
 
       $linkable->addItem($item);
     }
 
     $linked_box = $this->newBox($linked_head, $linked);
     $linkable_box = $this->newBox($linkable_head, $linkable);
 
     return array(
       $linked_box,
       $linkable_box,
     );
   }
 
 }