diff --git a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
index 758761b2ca..ea46fef540 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
@@ -1,140 +1,145 @@
 <?php
 
 final class PhabricatorAuthManagementRevokeWorkflow
   extends PhabricatorAuthManagementWorkflow {
 
   protected function didConstruct() {
     $this
       ->setName('revoke')
       ->setExamples(
         "**revoke** --type __type__ --from __user__\n".
         "**revoke** --everything --everywhere")
       ->setSynopsis(
         pht(
           'Revoke credentials which may have been leaked or disclosed.'))
       ->setArguments(
         array(
           array(
             'name' => 'from',
             'param' => 'user',
             'help' => pht(
               'Revoke credentials for the specified user.'),
           ),
           array(
             'name' => 'type',
             'param' => 'type',
             'help' => pht(
               'Revoke credentials of the given type.'),
           ),
           array(
             'name' => 'everything',
             'help' => pht('Revoke all credentials types.'),
           ),
           array(
             'name' => 'everywhere',
             'help' => pht('Revoke from all credential owners.'),
           ),
+          array(
+            'name' => 'force',
+            'help' => pht('Revoke credentials without prompting.'),
+          ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $all_types = PhabricatorAuthRevoker::getAllRevokers();
+    $is_force = $args->getArg('force');
 
     $type = $args->getArg('type');
     $is_everything = $args->getArg('everything');
     if (!strlen($type) && !$is_everything) {
       throw new PhutilArgumentUsageException(
         pht(
           'Specify the credential type to revoke with "--type" or specify '.
           '"--everything".'));
     } else if (strlen($type) && $is_everything) {
       throw new PhutilArgumentUsageException(
         pht(
           'Specify the credential type to revoke with "--type" or '.
           '"--everything", but not both.'));
     } else if ($is_everything) {
       $types = $all_types;
     } else {
       if (empty($all_types[$type])) {
         throw new PhutilArgumentUsageException(
           pht(
             'Credential type "%s" is not valid. Valid credential types '.
             'are: %s.',
             $type,
             implode(', ', array_keys($all_types))));
       }
       $types = array($all_types[$type]);
     }
 
     $is_everywhere = $args->getArg('everywhere');
     $from = $args->getArg('from');
     $target = null;
     if (!strlen($from) && !$is_everywhere) {
       throw new PhutilArgumentUsageException(
         pht(
           'Specify the target to revoke credentials from with "--from" or '.
           'specify "--everywhere".'));
     } else if (strlen($from) && $is_everywhere) {
       throw new PhutilArgumentUsageException(
         pht(
           'Specify the target to revoke credentials from with "--from" or '.
           'specify "--everywhere", but not both.'));
     } else if ($is_everywhere) {
       // Just carry the flag through.
     } else {
       $target = id(new PhabricatorObjectQuery())
         ->setViewer($viewer)
         ->withNames(array($from))
         ->executeOne();
       if (!$target) {
         throw new PhutilArgumentUsageException(
           pht(
             'Target "%s" is not a valid target to revoke credentials from. '.
             'Usually, revoke from "@username".',
             $from));
       }
     }
 
-    if ($is_everywhere) {
+    if ($is_everywhere && !$is_force) {
       echo id(new PhutilConsoleBlock())
         ->addParagraph(
           pht(
           'You are destroying an entire class of credentials. This may be '.
           'very disruptive to users. You should normally do this only if '.
           'you suspect there has been a widespread compromise which may '.
           'have impacted everyone.'))
         ->drawConsoleString();
 
       $prompt = pht('Really destroy credentials everywhere?');
       if (!phutil_console_confirm($prompt)) {
         throw new PhutilArgumentUsageException(
           pht('Aborted workflow.'));
       }
     }
 
     foreach ($types as $type) {
       $type->setViewer($viewer);
       if ($is_everywhere) {
         $count = $type->revokeAllCredentials();
       } else {
         $count = $type->revokeCredentialsFrom($target);
       }
 
       echo tsprintf(
         "%s\n",
         pht(
           'Destroyed %s credential(s) of type "%s".',
           new PhutilNumber($count),
           $type->getRevokerKey()));
     }
 
     echo tsprintf(
       "%s\n",
       pht('Done.'));
 
     return 0;
   }
 
 }