diff --git a/src/applications/tokens/controller/PhabricatorTokenGiveController.php b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
index c7c47c41f3..ef8dc75991 100644
--- a/src/applications/tokens/controller/PhabricatorTokenGiveController.php
+++ b/src/applications/tokens/controller/PhabricatorTokenGiveController.php
@@ -1,142 +1,144 @@
 <?php
 
 final class PhabricatorTokenGiveController extends PhabricatorTokenController {
 
  public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $phid = $request->getURIData('phid');
 
     $handle = id(new PhabricatorHandleQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($phid))
       ->executeOne();
     if (!$handle->isComplete()) {
       return new Aphront404Response();
     }
 
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($phid))
       ->executeOne();
 
     if (!($object instanceof PhabricatorTokenReceiverInterface)) {
       return new Aphront400Response();
     }
 
     if (!PhabricatorPolicyFilter::canInteract($viewer, $object)) {
       $lock = PhabricatorEditEngineLock::newForObject($viewer, $object);
 
       $dialog = $this->newDialog()
         ->addCancelButton($handle->getURI());
 
       return $lock->willBlockUserInteractionWithDialog($dialog);
     }
 
     $current = id(new PhabricatorTokenGivenQuery())
       ->setViewer($viewer)
       ->withAuthorPHIDs(array($viewer->getPHID()))
       ->withObjectPHIDs(array($handle->getPHID()))
       ->execute();
 
     if ($current) {
       $is_give = false;
       $title = pht('Rescind Token');
     } else {
       $is_give = true;
       $title = pht('Give Token');
     }
 
     $done_uri = $handle->getURI();
-    if ($request->isDialogFormPost()) {
+    if ($request->isFormOrHisecPost()) {
       $content_source = PhabricatorContentSource::newFromRequest($request);
 
       $editor = id(new PhabricatorTokenGivenEditor())
         ->setActor($viewer)
+        ->setRequest($request)
+        ->setCancelURI($handle->getURI())
         ->setContentSource($content_source);
       if ($is_give) {
         $token_phid = $request->getStr('tokenPHID');
         $editor->addToken($handle->getPHID(), $token_phid);
       } else {
         $editor->deleteToken($handle->getPHID());
       }
 
       return id(new AphrontReloadResponse())->setURI($done_uri);
     }
 
     if ($is_give) {
       $dialog = $this->buildGiveTokenDialog();
     } else {
       $dialog = $this->buildRescindTokenDialog(head($current));
     }
 
     $dialog->setUser($viewer);
     $dialog->addCancelButton($done_uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function buildGiveTokenDialog() {
     $viewer = $this->getViewer();
 
     $tokens = id(new PhabricatorTokenQuery())
       ->setViewer($viewer)
       ->execute();
 
     $buttons = array();
     $ii = 0;
     foreach ($tokens as $token) {
       $aural = javelin_tag(
         'span',
         array(
           'aural' => true,
         ),
         pht('Award "%s" Token', $token->getName()));
 
       $buttons[] = javelin_tag(
         'button',
         array(
           'class' => 'token-button',
           'name' => 'tokenPHID',
           'value' => $token->getPHID(),
           'type' => 'submit',
           'sigil' => 'has-tooltip',
           'meta' => array(
             'tip' => $token->getName(),
           ),
         ),
         array(
           $aural,
           $token->renderIcon(),
         ));
       if ((++$ii % 6) == 0) {
         $buttons[] = phutil_tag('br');
       }
     }
 
     $buttons = phutil_tag(
       'div',
       array(
         'class' => 'token-grid',
       ),
       $buttons);
 
     $dialog = new AphrontDialogView();
     $dialog->setTitle(pht('Give Token'));
     $dialog->appendChild($buttons);
 
     return $dialog;
   }
 
   private function buildRescindTokenDialog(PhabricatorTokenGiven $token_given) {
     $dialog = new AphrontDialogView();
     $dialog->setTitle(pht('Rescind Token'));
 
     $dialog->appendChild(
       pht('Really rescind this lovely token?'));
 
     $dialog->addSubmitButton(pht('Rescind Token'));
 
     return $dialog;
   }
 
 }
diff --git a/src/applications/tokens/editor/PhabricatorTokenGivenEditor.php b/src/applications/tokens/editor/PhabricatorTokenGivenEditor.php
index 0d2f143635..08a4cbf9b1 100644
--- a/src/applications/tokens/editor/PhabricatorTokenGivenEditor.php
+++ b/src/applications/tokens/editor/PhabricatorTokenGivenEditor.php
@@ -1,172 +1,216 @@
 <?php
 
 final class PhabricatorTokenGivenEditor
   extends PhabricatorEditor {
 
   private $contentSource;
+  private $request;
+  private $cancelURI;
 
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source;
     return $this;
   }
 
   public function getContentSource() {
     return $this->contentSource;
   }
 
+  public function setRequest(AphrontRequest $request) {
+    $this->request = $request;
+    return $this;
+  }
+
+  public function getRequest() {
+    return $this->request;
+  }
+
+  public function setCancelURI($cancel_uri) {
+    $this->cancelURI = $cancel_uri;
+    return $this;
+  }
+
+  public function getCancelURI() {
+    return $this->cancelURI;
+  }
+
   public function addToken($object_phid, $token_phid) {
     $token = $this->validateToken($token_phid);
     $object = $this->validateObject($object_phid);
     $current_token = $this->loadCurrentToken($object);
 
     $actor = $this->requireActor();
 
     $token_given = id(new PhabricatorTokenGiven())
       ->setAuthorPHID($actor->getPHID())
       ->setObjectPHID($object->getPHID())
       ->setTokenPHID($token->getPHID());
 
     $token_given->openTransaction();
 
       if ($current_token) {
         $this->executeDeleteToken($object, $current_token);
       }
 
       $token_given->save();
 
       queryfx(
         $token_given->establishConnection('w'),
         'INSERT INTO %T (objectPHID, tokenCount) VALUES (%s, 1)
           ON DUPLICATE KEY UPDATE tokenCount = tokenCount + 1',
         id(new PhabricatorTokenCount())->getTableName(),
         $object->getPHID());
 
-    $token_given->saveTransaction();
+      $current_token_phid = null;
+      if ($current_token) {
+        $current_token_phid = $current_token->getTokenPHID();
+      }
 
-    $current_token_phid = null;
-    if ($current_token) {
-      $current_token_phid = $current_token->getTokenPHID();
-    }
+      try {
+        $this->publishTransaction(
+          $object,
+          $current_token_phid,
+          $token->getPHID());
+      } catch (Exception $ex) {
+        $token_given->killTransaction();
+        throw $ex;
+      }
 
-    $this->publishTransaction(
-      $object,
-      $current_token_phid,
-      $token->getPHID());
+    $token_given->saveTransaction();
 
     $subscribed_phids = $object->getUsersToNotifyOfTokenGiven();
     if ($subscribed_phids) {
       $related_phids = $subscribed_phids;
       $related_phids[] = $actor->getPHID();
 
       $story_type = 'PhabricatorTokenGivenFeedStory';
       $story_data = array(
         'authorPHID' => $actor->getPHID(),
         'tokenPHID' => $token->getPHID(),
         'objectPHID' => $object->getPHID(),
       );
 
       id(new PhabricatorFeedStoryPublisher())
         ->setStoryType($story_type)
         ->setStoryData($story_data)
         ->setStoryTime(time())
         ->setStoryAuthorPHID($actor->getPHID())
         ->setRelatedPHIDs($related_phids)
         ->setPrimaryObjectPHID($object->getPHID())
         ->setSubscribedPHIDs($subscribed_phids)
         ->publish();
     }
 
     return $token_given;
   }
 
   public function deleteToken($object_phid) {
     $object = $this->validateObject($object_phid);
     $token_given = $this->loadCurrentToken($object);
     if (!$token_given) {
       return;
     }
 
-    $this->executeDeleteToken($object, $token_given);
-    $this->publishTransaction(
-      $object,
-      $token_given->getTokenPHID(),
-      null);
+    $token_given->openTransaction();
+      $this->executeDeleteToken($object, $token_given);
+
+      try {
+        $this->publishTransaction(
+          $object,
+          $token_given->getTokenPHID(),
+          null);
+      } catch (Exception $ex) {
+        $token_given->killTransaction();
+        throw $ex;
+      }
+
+    $token_given->saveTransaction();
   }
 
   private function executeDeleteToken(
     PhabricatorTokenReceiverInterface $object,
     PhabricatorTokenGiven $token_given) {
 
     $token_given->openTransaction();
       $token_given->delete();
 
       queryfx(
         $token_given->establishConnection('w'),
         'INSERT INTO %T (objectPHID, tokenCount) VALUES (%s, 0)
           ON DUPLICATE KEY UPDATE tokenCount = tokenCount - 1',
         id(new PhabricatorTokenCount())->getTableName(),
         $object->getPHID());
     $token_given->saveTransaction();
   }
 
   private function validateToken($token_phid) {
     $token = id(new PhabricatorTokenQuery())
       ->setViewer($this->requireActor())
       ->withPHIDs(array($token_phid))
       ->executeOne();
 
     if (!$token) {
       throw new Exception(pht('No such token "%s"!', $token_phid));
     }
 
     return $token;
   }
 
   private function validateObject($object_phid) {
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($this->requireActor())
       ->withPHIDs(array($object_phid))
       ->executeOne();
 
     if (!$object) {
       throw new Exception(pht('No such object "%s"!', $object_phid));
     }
 
     return $object;
   }
 
   private function loadCurrentToken(PhabricatorTokenReceiverInterface $object) {
     return id(new PhabricatorTokenGiven())->loadOneWhere(
       'authorPHID = %s AND objectPHID = %s',
       $this->requireActor()->getPHID(),
       $object->getPHID());
   }
 
 
   private function publishTransaction(
     PhabricatorTokenReceiverInterface $object,
     $old_token_phid,
     $new_token_phid) {
 
     if (!($object instanceof PhabricatorApplicationTransactionInterface)) {
       return;
     }
 
     $actor = $this->requireActor();
 
     $xactions = array();
     $xactions[] = id($object->getApplicationTransactionTemplate())
       ->setTransactionType(PhabricatorTransactions::TYPE_TOKEN)
       ->setOldValue($old_token_phid)
       ->setNewValue($new_token_phid);
 
     $editor = $object->getApplicationTransactionEditor()
       ->setActor($actor)
       ->setContentSource($this->getContentSource())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true);
 
+    $request = $this->getRequest();
+    if ($request) {
+      $editor->setRequest($request);
+    }
+
+    $cancel_uri = $this->getCancelURI();
+    if ($cancel_uri) {
+      $editor->setCancelURI($cancel_uri);
+    }
+
     $editor->applyTransactions($object, $xactions);
   }
 
 }