diff --git a/resources/sql/patches/20130321.token.sql b/resources/sql/patches/20130321.token.sql
new file mode 100644
index 0000000000..3c2f55e25e
--- /dev/null
+++ b/resources/sql/patches/20130321.token.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_token.token_count
+  ADD KEY `key_count` (tokenCount);
diff --git a/src/applications/tokens/controller/PhabricatorTokenLeaderController.php b/src/applications/tokens/controller/PhabricatorTokenLeaderController.php
index 71dfbbfbf8..fafb60e612 100644
--- a/src/applications/tokens/controller/PhabricatorTokenLeaderController.php
+++ b/src/applications/tokens/controller/PhabricatorTokenLeaderController.php
@@ -6,11 +6,13 @@ final class PhabricatorTokenLeaderController
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
-    $pager = id(new AphrontCursorPagerView())
-      ->readFromRequest($request);
+
+    $pager = new AphrontPagerView();
+    $pager->setURI($request->getRequestURI(), 'page');
+    $pager->setOffset($request->getInt('page'));
 
     $query = id(new PhabricatorTokenReceiverQuery());
-    $objects = $query->setViewer($user)->execute();
+    $objects = $query->setViewer($user)->executeWithOffsetPager($pager);
     $counts = $query->getTokenCounts();
 
     $handles = array();
diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
index cd1f405503..1e06df211f 100644
--- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
+++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
@@ -1202,6 +1202,10 @@ final class PhabricatorBuiltinPatchList extends PhabricatorSQLPatchList {
         'type'    => 'sql',
         'name'    => $this->getPatchPath('20130317.phrictionedge.sql'),
       ),
+      '20130321.token.sql' => array(
+        'type'    => 'sql',
+        'name'    => $this->getPatchPath('20130321.token.sql'),
+      ),
       '20130310.xactionmeta.sql' => array(
         'type'    => 'sql',
         'name'    => $this->getPatchPath('20130310.xactionmeta.sql'),