diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
index f4791d8bb6..b5387b935e 100644
--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
@@ -132,6 +132,10 @@ final class PhortuneAccountViewController extends PhortuneController {
     $methods = id(new PhortunePaymentMethodQuery())
       ->setViewer($viewer)
       ->withAccountPHIDs(array($account->getPHID()))
+      ->withStatuses(
+        array(
+          PhortunePaymentMethod::STATUS_ACTIVE,
+        ))
       ->execute();
 
     foreach ($methods as $method) {
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php b/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
index 659ae2f53e..d00db2725f 100644
--- a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
+++ b/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
@@ -38,11 +38,10 @@ final class PhortunePaymentMethodDisableController
     }
 
     return $this->newDialog()
-      ->setTitle(pht('Disable Payment Method?'))
-      ->setShortTitle(pht('Disable Payment Method'))
+      ->setTitle(pht('Remove Payment Method'))
       ->appendParagraph(
         pht(
-          'Disable the payment method "%s"?',
+          'Remove the payment method "%s" from your account?',
           phutil_tag(
             'strong',
             array(),
@@ -50,9 +49,9 @@ final class PhortunePaymentMethodDisableController
       ->appendParagraph(
         pht(
           'You will no longer be able to make payments using this payment '.
-          'method. Disabled payment methods can not be reactivated.'))
+          'method.'))
       ->addCancelButton($account_uri)
-      ->addSubmitButton(pht('Disable Payment Method'));
+      ->addSubmitButton(pht('Remove Payment Method'));
   }
 
 }