diff --git a/src/applications/people/controller/PhabricatorPeopleDisableController.php b/src/applications/people/controller/PhabricatorPeopleDisableController.php
--- a/src/applications/people/controller/PhabricatorPeopleDisableController.php
+++ b/src/applications/people/controller/PhabricatorPeopleDisableController.php
@@ -20,7 +20,7 @@
       return new Aphront404Response();
     }
 
-    // NOTE: We reach this controller via the administrative "Disable User"
+    // NOTE: We reach this controller via the administrative "Disable Account"
     // on profiles and also via the "X" action on the approval queue. We do
     // things slightly differently depending on the context the actor is in.
 
@@ -86,17 +86,17 @@
     }
 
     if ($should_disable) {
-      $title = pht('Disable User?');
-      $short_title = pht('Disable User');
+      $title = pht('Disable User Account?');
+      $short_title = pht('Disable Account');
 
       $body = pht(
         'Disable %s? They will no longer be able to access this server or '.
         'receive email.',
         phutil_tag('strong', array(), $user->getUsername()));
 
-      $submit = pht('Disable User');
+      $submit = pht('Disable Account');
     } else {
-      $title = pht('Enable User?');
+      $title = pht('Enable User Account?');
       $short_title = pht('Enable User');
 
       $body = pht(
@@ -104,7 +104,7 @@
         'email again.',
         phutil_tag('strong', array(), $user->getUsername()));
 
-      $submit = pht('Enable User');
+      $submit = pht('Enable Account');
     }
 
     return $this->newDialog()
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
@@ -152,10 +152,10 @@
 
     if ($user->getIsDisabled()) {
       $disable_icon = 'fa-check-circle-o';
-      $disable_name = pht('Enable User');
+      $disable_name = pht('Enable Account');
     } else {
       $disable_icon = 'fa-ban';
-      $disable_name = pht('Disable User');
+      $disable_name = pht('Disable Account');
     }
 
     $curtain->addAction(
diff --git a/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php b/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php
--- a/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php
+++ b/src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php
@@ -8,7 +8,7 @@
 
     if ($recipient->getIsDisabled()) {
       $this->throwValidationException(
-        pht('User is Disabled'),
+        pht('User Account is Disabled'),
         pht(
           'You can not send an email login link to this email address '.
           'because the associated user account is disabled.'));
diff --git a/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php b/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
--- a/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
+++ b/src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
@@ -28,7 +28,7 @@
 
     if ($recipient->getIsDisabled()) {
       $this->throwValidationException(
-        pht('User is Disabled'),
+        pht('User Account is Disabled'),
         pht(
           'You can not send welcome mail to this user because their account '.
           'is disabled.'));
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -46,12 +46,12 @@
         ->setKey('isDisabled')
         ->setOptions(
           pht('(Show All)'),
-          pht('Show Only Disabled Users'),
-          pht('Hide Disabled Users'))
+          pht('Show Only Disabled Accounts'),
+          pht('Hide Disabled Accounts'))
         ->setDescription(
           pht(
-            'Pass true to find only disabled users, or false to omit '.
-            'disabled users.')),
+            'Pass true to find only disabled accounts, or false to omit '.
+            'disabled accounts.')),
       id(new PhabricatorSearchThreeStateField())
         ->setLabel(pht('Bots'))
         ->setKey('isBot')
diff --git a/src/docs/user/userguide/users.diviner b/src/docs/user/userguide/users.diviner
--- a/src/docs/user/userguide/users.diviner
+++ b/src/docs/user/userguide/users.diviner
@@ -86,20 +86,20 @@
     a "Mailing List" note.
 
 
-Disabled Users
-==============
+Disabled User Accounts
+======================
 
-**Disabled Users** are accounts that are no longer active. Generally, when
+**Disabled Accounts** are accounts that are no longer active. Generally, when
 someone leaves a project (e.g., leaves your company, or their internship or
 contract ends) you should disable their account to terminate their access to
-the system. Disabled users:
+the system. Disabled user accounts:
 
   - can not login;
   - can not access the Conduit API;
   - do not receive email; and
   - appear with lower precedence in the UI when selecting users, with a
     "Disabled" note (because it usually does not make sense to, for example,
-    assign a task to a disabled user).
+    assign a task to a disabled user account).
 
 While users can also be deleted, it is strongly recommended that you disable
 them instead, particularly if they interacted with any objects in the system.