diff --git a/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php b/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
index 10c44aaec0..373adfbb54 100644
--- a/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
+++ b/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
@@ -154,6 +154,7 @@ final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
       id(new PHUIFormNumberControl())
         ->setName($this->getParameterName($config, 'totpcode'))
         ->setLabel(pht('App Code'))
+        ->setDisableAutocomplete(true)
         ->setCaption(pht('Factor Name: %s', $config->getFactorName()))
         ->setValue(idx($validation_result, 'value'))
         ->setError(idx($validation_result, 'error', true)));
diff --git a/src/view/form/control/PHUIFormNumberControl.php b/src/view/form/control/PHUIFormNumberControl.php
index d65e590746..26e7e03955 100644
--- a/src/view/form/control/PHUIFormNumberControl.php
+++ b/src/view/form/control/PHUIFormNumberControl.php
@@ -2,11 +2,28 @@
 
 final class PHUIFormNumberControl extends AphrontFormControl {
 
+  private $disableAutocomplete;
+
+  public function setDisableAutocomplete($disable_autocomplete) {
+    $this->disableAutocomplete = $disable_autocomplete;
+    return $this;
+  }
+
+  public function getDisableAutocomplete() {
+    return $this->disableAutocomplete;
+  }
+
   protected function getCustomControlClass() {
     return 'phui-form-number';
   }
 
   protected function renderInput() {
+    if ($this->getDisableAutocomplete()) {
+      $autocomplete = 'off';
+    } else {
+      $autocomplete = null;
+    }
+
     return javelin_tag(
       'input',
       array(
@@ -15,6 +32,7 @@ final class PHUIFormNumberControl extends AphrontFormControl {
         'name' => $this->getName(),
         'value' => $this->getValue(),
         'disabled' => $this->getDisabled() ? 'disabled' : null,
+        'autocomplete' => $autocomplete,
         'id' => $this->getID(),
       ));
   }