diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index bd4cfef6c2..47ea4e8bf1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4583,7 +4583,6 @@ phutil_register_library_map(array(
     'PhabricatorUserPreferencesTransaction' => 'applications/settings/storage/PhabricatorUserPreferencesTransaction.php',
     'PhabricatorUserPreferencesTransactionQuery' => 'applications/settings/query/PhabricatorUserPreferencesTransactionQuery.php',
     'PhabricatorUserProfile' => 'applications/people/storage/PhabricatorUserProfile.php',
-    'PhabricatorUserProfileEditor' => 'applications/people/editor/PhabricatorUserProfileEditor.php',
     'PhabricatorUserProfileImageCacheType' => 'applications/people/cache/PhabricatorUserProfileImageCacheType.php',
     'PhabricatorUserRealNameField' => 'applications/people/customfield/PhabricatorUserRealNameField.php',
     'PhabricatorUserRolesField' => 'applications/people/customfield/PhabricatorUserRolesField.php',
@@ -4593,6 +4592,8 @@ phutil_register_library_map(array(
     'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
     'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php',
     'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php',
+    'PhabricatorUserTransactionEditor' => 'applications/people/editor/PhabricatorUserTransactionEditor.php',
+    'PhabricatorUserTransactionType' => 'applications/people/xaction/PhabricatorUserTransactionType.php',
     'PhabricatorUsersEditField' => 'applications/transactions/editfield/PhabricatorUsersEditField.php',
     'PhabricatorUsersPolicyRule' => 'applications/people/policyrule/PhabricatorUsersPolicyRule.php',
     'PhabricatorUsersSearchField' => 'applications/people/searchfield/PhabricatorUsersSearchField.php',
@@ -10575,7 +10576,6 @@ phutil_register_library_map(array(
     'PhabricatorUserPreferencesTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorUserPreferencesTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorUserProfile' => 'PhabricatorUserDAO',
-    'PhabricatorUserProfileEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorUserProfileImageCacheType' => 'PhabricatorUserCacheType',
     'PhabricatorUserRealNameField' => 'PhabricatorUserCustomField',
     'PhabricatorUserRolesField' => 'PhabricatorUserCustomField',
@@ -10584,7 +10584,9 @@ phutil_register_library_map(array(
     'PhabricatorUserStatusField' => 'PhabricatorUserCustomField',
     'PhabricatorUserTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserTitleField' => 'PhabricatorUserCustomField',
-    'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction',
+    'PhabricatorUserTransaction' => 'PhabricatorModularTransaction',
+    'PhabricatorUserTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
+    'PhabricatorUserTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorUsersEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorUsersSearchField' => 'PhabricatorSearchTokenizerField',
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
index 3eda8a968b..4876f4495d 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -38,10 +38,9 @@ final class PhabricatorPeopleProfileEditController
         new PhabricatorUserTransaction(),
         $request);
 
-      $editor = id(new PhabricatorUserProfileEditor())
+      $editor = id(new PhabricatorUserTransactionEditor())
         ->setActor($viewer)
-        ->setContentSource(
-          PhabricatorContentSource::newFromRequest($request))
+        ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true);
 
       try {
diff --git a/src/applications/people/editor/PhabricatorUserProfileEditor.php b/src/applications/people/editor/PhabricatorUserTransactionEditor.php
similarity index 73%
rename from src/applications/people/editor/PhabricatorUserProfileEditor.php
rename to src/applications/people/editor/PhabricatorUserTransactionEditor.php
index 9ec02ba2af..c0dfa941af 100644
--- a/src/applications/people/editor/PhabricatorUserProfileEditor.php
+++ b/src/applications/people/editor/PhabricatorUserTransactionEditor.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorUserProfileEditor
+final class PhabricatorUserTransactionEditor
   extends PhabricatorApplicationTransactionEditor {
 
   public function getEditorApplicationClass() {
@@ -8,8 +8,7 @@ final class PhabricatorUserProfileEditor
   }
 
   public function getEditorObjectsDescription() {
-    return pht('User Profiles');
+    return pht('Users');
   }
 
-
 }
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index ba8b1cf292..03da9dee04 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1362,7 +1362,7 @@ final class PhabricatorUser
 
 
   public function getApplicationTransactionEditor() {
-    return new PhabricatorUserProfileEditor();
+    return new PhabricatorUserTransactionEditor();
   }
 
   public function getApplicationTransactionObject() {
diff --git a/src/applications/people/storage/PhabricatorUserTransaction.php b/src/applications/people/storage/PhabricatorUserTransaction.php
index b4bd1c9865..24edb2f5b5 100644
--- a/src/applications/people/storage/PhabricatorUserTransaction.php
+++ b/src/applications/people/storage/PhabricatorUserTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorUserTransaction
-  extends PhabricatorApplicationTransaction {
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'user';
@@ -15,4 +15,8 @@ final class PhabricatorUserTransaction
     return null;
   }
 
+  public function getBaseTransactionClass() {
+    return 'PhabricatorUserTransactionType';
+  }
+
 }
diff --git a/src/applications/people/xaction/PhabricatorUserTransactionType.php b/src/applications/people/xaction/PhabricatorUserTransactionType.php
new file mode 100644
index 0000000000..89392fd039
--- /dev/null
+++ b/src/applications/people/xaction/PhabricatorUserTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class PhabricatorUserTransactionType
+  extends PhabricatorModularTransactionType {}