diff --git a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
index ffaaf262f0..8a130939d1 100644
--- a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
@@ -1,191 +1,238 @@
 <?php
 
 final class PhabricatorDaemonConsoleController
   extends PhabricatorDaemonController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
+    $window_start = (time() - (60 * 15));
+
+    // Assume daemons spend about 250ms second in overhead per task acquiring
+    // leases and doing other bookkeeping. This is probably an over-estimation,
+    // but we'd rather show that utilization is too high than too low.
+    $lease_overhead = 0.250;
+
     $completed = id(new PhabricatorWorkerArchiveTask())->loadAllWhere(
       'dateModified > %d',
-      time() - (60 * 15));
+      $window_start);
 
     $failed = id(new PhabricatorWorkerActiveTask())->loadAllWhere(
       'failureTime > %d',
-      time() - (60 * 15));
+      $window_start);
+
+    $usage_total = 0;
+    $usage_start = PHP_INT_MAX;
 
     $completed_info = array();
     foreach ($completed as $completed_task) {
       $class = $completed_task->getTaskClass();
       if (empty($completed_info[$class])) {
         $completed_info[$class] = array(
           'n' => 0,
           'duration' => 0,
         );
       }
       $completed_info[$class]['n']++;
       $duration = $completed_task->getDuration();
       $completed_info[$class]['duration'] += $duration;
+
+      // NOTE: Duration is in microseconds, but we're just using seconds to
+      // compute utilization.
+      $usage_total += $lease_overhead + ($duration / 1000000);
+      $usage_start = min($usage_start, $completed_task->getDateModified());
     }
 
     $completed_info = isort($completed_info, 'n');
 
     $rows = array();
     foreach ($completed_info as $class => $info) {
       $rows[] = array(
         $class,
         number_format($info['n']),
         number_format((int)($info['duration'] / $info['n'])).' us',
       );
     }
 
     if ($failed) {
+      // Add the time it takes to restart the daemons. This includes a guess
+      // about other overhead of 2X.
+      $usage_total += PhutilDaemonOverseer::RESTART_WAIT * count($failed) * 2;
+      foreach ($failed as $failed_task) {
+        $usage_start = min($usage_start, $failed_task->getFailureTime());
+      }
+
       $rows[] = array(
         phutil_tag('em', array(), pht('Temporary Failures')),
         count($failed),
         null,
       );
     }
 
+    $logs = id(new PhabricatorDaemonLogQuery())
+      ->setViewer($user)
+      ->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
+      ->execute();
+
+    $taskmasters = 0;
+    foreach ($logs as $log) {
+      if ($log->getDaemon() == 'PhabricatorTaskmasterDaemon') {
+        $taskmasters++;
+      }
+    }
+
+    if ($taskmasters && $usage_total) {
+      // Total number of wall-time seconds the daemons have been running since
+      // the oldest event. For very short times round up to 15s so we don't
+      // render any ridiculous numbers if you reload the page immediately after
+      // restarting the daemons.
+      $available_time = $taskmasters * max(15, (time() - $usage_start));
+
+      // Percentage of those wall-time seconds we can account for, which the
+      // daemons spent doing work:
+      $used_time = ($usage_total / $available_time);
+
+      $rows[] = array(
+        phutil_tag('em', array(), pht('Queue Utilization (Approximate)')),
+        sprintf('%.1f%%', 100 * $used_time),
+        null,
+      );
+    }
+
     $completed_table = new AphrontTableView($rows);
     $completed_table->setNoDataString(
       pht('No tasks have completed in the last 15 minutes.'));
     $completed_table->setHeaders(
       array(
         pht('Class'),
         pht('Count'),
         pht('Avg'),
       ));
     $completed_table->setColumnClasses(
       array(
         'wide',
         'n',
         'n',
       ));
 
     $completed_header = id(new PHUIHeaderView())
       ->setHeader(pht('Recently Completed Tasks (Last 15m)'));
 
     $completed_panel = new AphrontPanelView();
     $completed_panel->appendChild($completed_table);
     $completed_panel->setNoBackground();
 
-    $logs = id(new PhabricatorDaemonLogQuery())
-      ->setViewer($user)
-      ->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
-      ->execute();
-
     $daemon_header = id(new PHUIHeaderView())
       ->setHeader(pht('Active Daemons'));
 
     $daemon_table = new PhabricatorDaemonLogListView();
     $daemon_table->setUser($user);
     $daemon_table->setDaemonLogs($logs);
 
     $tasks = id(new PhabricatorWorkerActiveTask())->loadAllWhere(
       'leaseOwner IS NOT NULL');
 
     $rows = array();
     foreach ($tasks as $task) {
       $rows[] = array(
         $task->getID(),
         $task->getTaskClass(),
         $task->getLeaseOwner(),
         $task->getLeaseExpires() - time(),
         $task->getFailureCount(),
         phutil_tag(
           'a',
           array(
             'href' => '/daemon/task/'.$task->getID().'/',
             'class' => 'button small grey',
           ),
           pht('View Task')),
       );
     }
 
     $leased_table = new AphrontTableView($rows);
     $leased_table->setHeaders(
       array(
         pht('ID'),
         pht('Class'),
         pht('Owner'),
         pht('Expires'),
         pht('Failures'),
         '',
       ));
     $leased_table->setColumnClasses(
       array(
         'n',
         'wide',
         '',
         '',
         'n',
         'action',
       ));
     $leased_table->setNoDataString(pht('No tasks are leased by workers.'));
 
     $leased_panel = new AphrontPanelView();
     $leased_panel->setHeader('Leased Tasks');
     $leased_panel->appendChild($leased_table);
     $leased_panel->setNoBackground();
 
     $task_table = new PhabricatorWorkerActiveTask();
     $queued = queryfx_all(
       $task_table->establishConnection('r'),
       'SELECT taskClass, count(*) N FROM %T GROUP BY taskClass
         ORDER BY N DESC',
       $task_table->getTableName());
 
     $rows = array();
     foreach ($queued as $row) {
       $rows[] = array(
         $row['taskClass'],
         number_format($row['N']),
       );
     }
 
     $queued_table = new AphrontTableView($rows);
     $queued_table->setHeaders(
       array(
         pht('Class'),
         pht('Count'),
       ));
     $queued_table->setColumnClasses(
       array(
         'wide',
         'n',
       ));
     $queued_table->setNoDataString(pht('Task queue is empty.'));
 
     $queued_panel = new AphrontPanelView();
     $queued_panel->setHeader(pht('Queued Tasks'));
     $queued_panel->appendChild($queued_table);
     $queued_panel->setNoBackground();
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
         ->setName(pht('Console')));
 
     $nav = $this->buildSideNavView();
     $nav->selectFilter('/');
     $nav->appendChild(
       array(
         $crumbs,
         $completed_header,
         $completed_panel,
         $daemon_header,
         $daemon_table,
         $queued_panel,
         $leased_panel,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => pht('Console'),
       ));
   }
 
 }
diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
index 87f315ca59..a12cff7a57 100644
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -1,101 +1,101 @@
 <?php
 
 final class PassphraseCredentialControl extends AphrontFormControl {
 
-  private $options;
+  private $options = array();
   private $credentialType;
   private $defaultUsername;
   private $allowNull;
 
   public function setAllowNull($allow_null) {
     $this->allowNull = $allow_null;
     return $this;
   }
 
   public function setDefaultUsername($default_username) {
     $this->defaultUsername = $default_username;
     return $this;
   }
 
   public function setCredentialType($credential_type) {
     $this->credentialType = $credential_type;
     return $this;
   }
 
   public function getCredentialType() {
     return $this->credentialType;
   }
 
   public function setOptions(array $options) {
     assert_instances_of($options, 'PassphraseCredential');
     $this->options = $options;
     return $this;
   }
 
   protected function getCustomControlClass() {
     return 'passphrase-credential-control';
   }
 
   protected function renderInput() {
 
     $options_map = array();
     foreach ($this->options as $option) {
       $options_map[$option->getPHID()] = pht(
         "%s %s",
         'K'.$option->getID(),
         $option->getName());
     }
 
     $disabled = $this->getDisabled();
     if ($this->allowNull) {
       $options_map = array('' => pht('(No Credentials)')) + $options_map;
     } else {
       if (!$options_map) {
         $options_map[''] = pht('(No Existing Credentials)');
         $disabled = true;
       }
     }
 
     Javelin::initBehavior('passphrase-credential-control');
 
     $options = AphrontFormSelectControl::renderSelectTag(
       $this->getValue(),
       $options_map,
       array(
         'id' => $this->getControlID(),
         'name' => $this->getName(),
         'disabled' => $disabled ? 'disabled' : null,
         'sigil' => 'passphrase-credential-select',
       ));
 
     if ($this->credentialType) {
       $button = javelin_tag(
         'a',
         array(
           'href' => '#',
           'class' => 'button grey',
           'sigil' => 'passphrase-credential-add',
           'mustcapture' => true,
         ),
         pht('Add Credential'));
     } else {
       $button = null;
     }
 
     return javelin_tag(
       'div',
       array(
         'sigil' => 'passphrase-credential-control',
         'meta' => array(
           'type' => $this->getCredentialType(),
           'username' => $this->defaultUsername,
           'allowNull' => $this->allowNull,
         ),
       ),
       array(
         $options,
         $button,
       ));
   }
 
 }