diff --git a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
--- a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
+++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
@@ -62,6 +62,9 @@
           ->setSubtitle($subtitle)
           ->setTokenIcon('fa-user');
       }
+      if ($user->getIsSystemAgent()) {
+        $handle->setSystemAgent(true);
+      }
 
       $availability = null;
       if ($user->getIsDisabled()) {
diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
--- a/src/applications/phid/PhabricatorObjectHandle.php
+++ b/src/applications/phid/PhabricatorObjectHandle.php
@@ -25,6 +25,7 @@
   private $timestamp;
   private $status = self::STATUS_OPEN;
   private $availability = self::AVAILABILITY_FULL;
+  private $systemAgent = false;
   private $complete;
   private $objectName;
   private $policyFiltered;
@@ -283,6 +284,15 @@
     return $this->getType();
   }
 
+  public function setSystemAgent($system_agent) {
+    $this->systemAgent = $system_agent;
+    return $this;
+  }
+
+  public function getSystemAgent() {
+    return $this->systemAgent;
+  }
+
 
   /**
    * Set whether or not the underlying object is complete. See
@@ -367,6 +377,9 @@
     if ($this->getType() == PhabricatorPeopleUserPHIDType::TYPECONST) {
       $classes[] = 'phui-link-person';
     }
+    if ($this->getSystemAgent()) {
+      $classes[] = 'phui-system-agent';
+    }
 
     $uri = $this->getURI();