diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -58,6 +58,9 @@
     $min_range = $this->getDateFrom($saved)->getEpoch();
     $max_range = $this->getDateTo($saved)->getEpoch();
 
+    $user_datasource = id(new PhabricatorPeopleUserFunctionDatasource())
+      ->setViewer($viewer);
+
     if ($this->isMonthView($saved) ||
       $this->isDayView($saved)) {
       list($start_year, $start_month, $start_day) =
@@ -124,11 +127,13 @@
     }
 
     $invited_phids = $saved->getParameter('invitedPHIDs');
+    $invited_phids = $user_datasource->evaluateTokens($invited_phids);
     if ($invited_phids) {
       $query->withInvitedPHIDs($invited_phids);
     }
 
     $creator_phids = $saved->getParameter('creatorPHIDs');
+    $creator_phids = $user_datasource->evaluateTokens($creator_phids);
     if ($creator_phids) {
       $query->withCreatorPHIDs($creator_phids);
     }
@@ -196,13 +201,13 @@
     $form
       ->appendControl(
         id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
+          ->setDatasource(new PhabricatorPeopleUserFunctionDatasource())
           ->setName('creators')
           ->setLabel(pht('Created By'))
           ->setValue($creator_phids))
       ->appendControl(
         id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
+          ->setDatasource(new PhabricatorPeopleUserFunctionDatasource())
           ->setName('invited')
           ->setLabel(pht('Invited'))
           ->setValue($invited_phids))