diff --git a/docs/migration/wsc62/deprecations_removals.md b/docs/migration/wsc62/deprecations_removals.md
index 34aee8fab..f4249ab7d 100644
--- a/docs/migration/wsc62/deprecations_removals.md
+++ b/docs/migration/wsc62/deprecations_removals.md
@@ -126,6 +126,23 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `wcf\data\notice\NoticeEditor`
 - `wcf\data\ad\AdAction`
 - `wcf\data\ad\AdEditor`
+- `wcf\acp\form\UserMergeForm`
+- `wcf\system\event\listener\AbstractUserMergeListener`
+- `wcf\system\event\listener\AbstractUserActionRenameListener`
+- `wcf\data\user\UserEditor`
+- `wcf\data\user\UserAction`
+- `wcf\data\user\UserProfileAction`
+- `wcf\data\user\option\UserOptionAction`
+- `wcf\data\user\option\UserOptionEditor`
+- `wcf\data\user\option\ViewableUserOption`
+- `wcf\data\user\option\category\UserOptionCategoryAction`
+- `wcf\data\user\option\category\UserOptionCategoryEditor`
+- `wcf\system\condition\UserMultifactorCondition`
+- `wcf\system\condition\UserUserIDCondition`
+- `wcf\system\option\ISearchableConditionUserOption`
+- `wcf\system\option\ISearchableUserOption`
+- `wcf\system\option\user\IUserOptionOutput`
+- `wcf\system\worker\SendNewPasswordWorker`
 
 #### Methods
 
@@ -359,6 +376,11 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `calendar\data\event\date\EventDateEditor::rebuildParticipants()`
 - `wcf\data\notice\Notice::getConditions()`
 - `wcf\data\user\group\assignment\UserGroupAssignment::getConditions()`
+- `wcf\data\user\profile\menu\item\UserProfileMenuItemAction::validateGetContent()`
+- `wcf\data\user\profile\menu\item\UserProfileMenuItemAction::getContent()`
+- `wcf\data\user\UserProfile::setFileAvatar()`
+- `wcf\system\view\user\profile\UserProfileHeaderView::isInAccessibleGroup()`
+- `wcf\util\UserRegistrationUtil::getRandomFieldName()`
 
 #### Properties
 
@@ -371,6 +393,7 @@ With version 6.3, we have deprecated certain components and removed several othe
 #### Object Type Definitions
 
 - `com.woltlab.wcf.sitemap.object`, use the event `wcf\event\sitemap\SitemapObjectCollecting` instead
+- `com.woltlab.wcf.condition.userSearch`, use the event `wcf\event\gridView\admin\UserGridViewInitialized` to add filters to the user list instead
 
 ### JavaScript
 
@@ -378,6 +401,7 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `WoltLabSuite/Core/Ui/Sortable/List`
 - `WoltLabSuite/Core/Component/GoogleMaps/MarkerLoader::setup()`
 - `WoltLabSuite/Core/Ui/User/Sortable/ObjectWatch`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/Handler/SendNewPassword`
 
 ## Removals
 
@@ -449,6 +473,33 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `wcf\data\acp\session\ACPSessionList`
 - `calendar\data\user\FollowingBirthdayAction`
 - `calendar\data\category\CalendarCategoryAction`
+- `wcf\acp\action\UserQuickSearchAction`
+- `wcf\acp\form\UserAssignToGroupForm`
+- `wcf\acp\form\UserContentRevertChangesForm`
+- `wcf\acp\form\UserEmailAddressExportForm`
+- `wcf\acp\form\UserOptionListForm`
+- `wcf\acp\form\UserSearchForm`
+- `wcf\action\EmailValidationAction`
+- `wcf\action\UsernameValidationAction`
+- `wcf\data\user\UserContentAction`
+- `wcf\data\user\UserRegistrationAction`
+- `wcf\form\UserSearchForm`
+- `wcf\system\clipboard\action\UserClipboardAction`
+- `wcf\system\clipboard\action\UserContentClipboardAction`
+- `wcf\system\condition\UserOptionsCondition`
+- `wcf\system\listView\user\UserSearchResultsListView`
+- `wcf\system\option\user\BirthdayUserOptionOutput`
+- `wcf\system\option\user\DateUserOptionOutput`
+- `wcf\system\option\user\FacebookUserOptionOutput`
+- `wcf\system\option\user\FloatUserOptionOutput`
+- `wcf\system\option\user\ImageUserOptionOutput`
+- `wcf\system\option\user\LabeledUrlUserOptionOutput`
+- `wcf\system\option\user\MessageUserOptionOutput`
+- `wcf\system\option\user\NewlineToBreakUserOptionOutput`
+- `wcf\system\option\user\SelectOptionsUserOptionOutput`
+- `wcf\system\option\user\TwitterUserOptionOutput`
+- `wcf\system\option\user\URLUserOptionOutput`
+- `wcf\system\option\user\UserOptionHandler`
 
 #### Methods
 
@@ -558,6 +609,18 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `calendar\data\event\date\participation\EventDateParticipationAction::invite()`
 - `wcf\data\package\update\PackageUpdateAction::validateSearchForUpdates()`
 - `wcf\data\package\update\PackageUpdateAction::searchForUpdates()`
+- `wcf\data\user\UserAction::validatePrepareRemoveContent()`
+- `wcf\data\user\UserAction::prepareRemoveContent()`
+- `wcf\data\user\UserProfileAction::validateBeginEdit()`
+- `wcf\data\user\UserProfileAction::beginEdit()`
+- `wcf\data\user\UserProfileAction::validateSave()`
+- `wcf\data\user\UserProfileAction::save()`
+- `wcf\data\user\UserProfileAction::getOptionHandler()`
+- `wcf\data\user\option\UserOption::setUser()`
+- `wcf\data\user\option\UserOption::modifyEditableOption()`
+- `wcf\data\user\option\UserOption::modifyVisibleOption()`
+- `wcf\data\user\option\UserOption::setRequired()`
+- `wcf\data\user\option\ViewableUserOption::getOutputObject()`
 
 #### Properties
 
@@ -574,6 +637,10 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `wcf\data\comment\ViewableComment::$userProfile`
 - `wcf\data\comment\response\StructuredCommentResponse::$userProfile`
 - `wcf\data\comment\response\ViewableCommentResponse::$userProfile`
+- `wcf\data\user\option\UserOption::$optionValue`
+- `wcf\data\user\option\UserOption::$user`
+- `wcf\data\user\option\ViewableUserOption::$outputObjects`
+- `wcf\page\MembersListPage::$searchID`
 
 ### JavaScript
 
@@ -627,3 +694,23 @@ With version 6.3, we have deprecated certain components and removed several othe
 - `WCF.ACP.Package.Update.Search`
 - `WoltLabSuite/Calendar/Ui/Category/MarkAllAsRead`
 - `WCF.ACP.Ad.LocationHandler`
+- `WoltLabSuite/Core/Acp/Component/Tag/SynonymsHandler`
+- `WoltLabSuite/Core/Acp/Controller/User/List`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/Abstract`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/BanAction`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/DeleteAction`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Ban/Dialog`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Delete`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/SendNewPasswordAction`
+- `WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction`
+- `WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard`
+- `WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler`
+- `WoltLabSuite/Core/Acp/Ui/User/Editor`
+- `WoltLabSuite/Core/Ui/User/Editor`
+- `WCF.User.Profile.Editor`
+- `WCF.User.Registration`
+- `WCF.User.Registration.Validation`
+- `WCF.User.Registration.Validation.EmailAddress`
+- `WCF.User.Registration.Validation.Username`
diff --git a/docs/migration/wsc62/php.md b/docs/migration/wsc62/php.md
index 4d2032ce0..d74f0fe09 100644
--- a/docs/migration/wsc62/php.md
+++ b/docs/migration/wsc62/php.md
@@ -391,3 +391,495 @@ A condition like `userID NOT IN (?)` excludes all events of guests and must be w
 
 Implementations of `IUserActivityEvent` that require a registered user, for example to look up the author of a comment, must handle guests.
 The `TCommentResponseUserActivityEvent` trait provides `getCommentAuthor()` that returns a guest profile for comments written by guests.
+
+## User Merging
+
+The ACP form `wcf\acp\form\UserMergeForm` has been replaced by a dialog of the bulk interactions in the user list, the users are merged by the command `wcf\command\user\MergeUsers`.
+`UserMergeForm` and `wcf\system\event\listener\AbstractUserMergeListener` are deprecated.
+Event listeners for the `save` event of `UserMergeForm` are still executed, but should be migrated.
+
+The PSR-14 event `wcf\event\user\UsersMerging` is fired before the merged users are deleted.
+Instead of extending `AbstractUserMergeListener`, a bootstrap script registers the database columns that reference users through `UsersMerging::reassignUserColumn()`.
+Unlike `AbstractUserMergeListener`, the column containing the username is not updated unless it is explicitly passed as `usernameColumn`.
+
+```php
+// Previously
+class FooUserMergeListener extends AbstractUserMergeListener
+{
+    protected $databaseTables = [
+        'foo1_foo',
+        [
+            'name' => 'foo1_foo',
+            'userID' => 'editorID',
+            'username' => 'editor',
+        ],
+        [
+            'name' => 'foo1_bar',
+            'username' => null,
+            'ignore' => true,
+        ],
+    ];
+}
+
+// Since 6.3
+EventHandler::getInstance()->register(
+    \wcf\event\user\UsersMerging::class,
+    static function (\wcf\event\user\UsersMerging $event) {
+        $event->reassignUserColumn('foo1_foo', usernameColumn: 'username');
+        $event->reassignUserColumn('foo1_foo', 'editorID', 'editor');
+        $event->reassignUserColumn('foo1_bar', ignore: true);
+    }
+);
+```
+
+The registered columns are updated after all event listeners have been executed.
+Listeners that need to perform other changes can access the destination user and the merged users through the properties `destinationUser` and `mergedUsers` of the event.
+
+## User Renaming
+
+Users are renamed through the command `wcf\command\user\UpdateUser`, which fires the PSR-14 event `wcf\event\user\UserRenamed`.
+`wcf\system\event\listener\AbstractUserActionRenameListener` is deprecated.
+Event listeners for the `rename` event of `wcf\data\user\UserAction` are still executed, but should be migrated.
+
+Instead of extending `AbstractUserActionRenameListener`, a bootstrap script registers the database columns containing the username through `UserRenamed::updateUsernameColumn()`.
+
+```php
+// Previously
+class FooUserActionRenameListener extends AbstractUserActionRenameListener
+{
+    protected $databaseTables = [
+        'foo1_foo',
+        [
+            'name' => 'foo1_foo',
+            'userID' => 'editorID',
+            'username' => 'editor',
+        ],
+    ];
+}
+
+// Since 6.3
+EventHandler::getInstance()->register(
+    \wcf\event\user\UserRenamed::class,
+    static function (\wcf\event\user\UserRenamed $event) {
+        $event->updateUsernameColumn('foo1_foo');
+        $event->updateUsernameColumn('foo1_foo', 'editorID', 'editor');
+    }
+);
+```
+
+The registered columns are updated after all event listeners have been executed.
+Listeners that need to perform other changes can access the renamed user and the previous username through the properties `user` and `oldUsername` of the event.
+
+## Creating and Updating Users
+
+`wcf\data\user\UserAction` and `wcf\data\user\UserEditor` are deprecated, users are created and modified through the [database object builder](../../php/database-object-builder.md) `wcf\data\user\UserBuilder` and the commands in the `wcf\command\user` namespace.
+The commands take care of all side effects, such as updating the user rank, the user online marking and the automatic user group assignments.
+
+```php
+// Previously
+$action = new UserAction([], 'create', [
+    'data' => [
+        'username' => 'Foo',
+        'email' => 'foo@example.com',
+        'password' => $password,
+    ],
+    'groups' => [$groupID],
+    'options' => [
+        User::getUserOptionID('location') => 'Berlin',
+    ],
+]);
+$user = $action->executeAction()['returnValues'];
+
+// Since 6.3
+$user = (new CreateUser(
+    UserBuilder::forCreate()
+        ->setUsername('Foo')
+        ->setEmail('foo@example.com')
+        ->setPassword($password)
+        ->setRegistrationDate(\TIME_NOW)
+        ->setGroupIDs([
+            ...UserGroup::getGroupIDsByType([UserGroup::EVERYONE, UserGroup::USERS]),
+            $groupID,
+        ])
+        ->setUserOption(User::getUserOptionID('location'), 'Berlin')
+))();
+```
+
+```php
+// Previously
+$action = new UserAction([$user], 'update', [
+    'data' => [
+        'userTitle' => 'Bar',
+        'fooColumn' => 1,
+    ],
+]);
+$action->executeAction();
+
+// Since 6.3
+$user = (new UpdateUser(
+    UserBuilder::forUpdate($user)
+        ->setUserTitle('Bar')
+        ->setCustomProperty('fooColumn', 1)
+))();
+```
+
+The user options, the user groups and the content languages are stored in separate tables that are written after the user itself.
+The object returned by `UserBuilder::create()` and `UserBuilder::update()` is therefore loaded before these tables have been written, always use the `CreateUser` and `UpdateUser` commands which return an up-to-date object.
+`UserBuilder::delete()` only removes the database row, use the `DeleteUser` command to delete a user including the associated data.
+
+The methods of `UserAction` and `UserProfileAction` have been replaced as follows:
+
+| Method | Replacement |
+| ------ | ----------- |
+| `UserAction::create()` | `wcf\command\user\CreateUser` |
+| `UserAction::update()` | `wcf\command\user\UpdateUser` |
+| `UserAction::delete()` | `wcf\command\user\DeleteUser` |
+| `UserAction::addToGroups()` | `wcf\command\user\AddUserToGroups` |
+| `UserAction::removeFromGroups()` | `wcf\command\user\RemoveUserFromGroups` |
+| `UserAction::ban()` / `unban()` | `wcf\command\user\BanUser` / `UnbanUser` |
+| `UserAction::enable()` / `disable()` | `wcf\command\user\EnableUser` / `DisableUser` |
+| `UserAction::confirmEmail()` / `unconfirmEmail()` | `wcf\command\user\ConfirmUserEmail` / `UnconfirmUserEmail` |
+| `UserAction::enableAvatar()` / `disableAvatar()` | `wcf\command\user\EnableUserAvatar` / `DisableUserAvatar` |
+| `UserAction::enableCoverPhoto()` / `disableCoverPhoto()` | `wcf\command\user\EnableUserCoverPhoto` / `DisableUserCoverPhoto` |
+| `UserAction::enableSignature()` / `disableSignature()` | `wcf\command\user\EnableUserSignature` / `DisableUserSignature` |
+| `UserAction::resendActivationMail()` | `wcf\command\user\ResendActivationMail` |
+| `UserAction::saveUserConsent()` | RPC endpoint `wcf\system\endpoint\controller\core\users\SaveUserConsent` |
+| `UserAction::devtoolsSetLanguage()` | RPC endpoint `wcf\system\endpoint\controller\core\devtools\SetLanguage` |
+| `UserProfileAction::getMessagePreview()` | RPC endpoint `wcf\system\endpoint\controller\core\users\RenderSignaturePreview` |
+| `UserProfileAction::getDetailedActivityPointList()` | RPC endpoint `wcf\system\endpoint\controller\core\users\GetUserActivityPointList` |
+| `UserProfileAction::updateUserRank()` | `wcf\command\user\RefreshUserRanks` |
+| `UserProfileAction::updateUserOnlineMarking()` | `wcf\command\user\RefreshUserOnlineMarkings` |
+| `UserProfileAction::updateSpecialTrophies()` | `wcf\command\user\SetSpecialTrophies` |
+| `SendNewPasswordWorker` | `wcf\command\user\SendNewPassword` |
+
+Additionally, the commands `DisableUserMultifactor`, `DisconnectThirdPartyLogin` and `MergeUsers` have been added.
+
+!!! warning "WoltLab Suite no longer uses `UserAction` to create, update or delete users. Event listeners for the `initializeAction` and `finalizeAction` events of `UserAction` are no longer executed for these operations and must be migrated to the PSR-14 events below. Conversely, the deprecated methods `UserAction::create()`, `UserAction::update()` and `UserAction::delete()` do not fire the new events."
+
+### Events
+
+The commands fire the following PSR-14 events:
+
+| Event | Description |
+| ----- | ----------- |
+| `wcf\event\user\UserCreated` | Fired after a user has been created, provides the user and the builder. |
+| `wcf\event\user\UserUpdated` | Fired after a user has been updated, provides the updated user and the builder. |
+| `wcf\event\user\UserDeleted` | Fired after a user has been deleted. |
+
+All commands that modify a user, such as `BanUser` or `AddUserToGroups`, use `UpdateUser` internally and therefore fire `UserUpdated`.
+The builder exposes the changes, `getUserOptions()`, `getGroupIDs()` and `getLanguageIDs()` return `null` if the respective data has not been changed.
+The user prior to the update is available through `$event->builder->getObject()`.
+
+```php
+EventHandler::getInstance()->register(
+    \wcf\event\user\UserUpdated::class,
+    static function (\wcf\event\user\UserUpdated $event) {
+        if ($event->builder->getGroupIDs() === null) {
+            return;
+        }
+
+        // The user groups have been changed.
+    }
+);
+```
+
+### Legacy Events of `UserProfile`
+
+The legacy events `getAvatar` and `isAccessible` of `wcf\data\user\UserProfile` have been removed in favor of PSR-14 events.
+
+```php
+// Previously
+final class FooUserProfileListener implements IParameterizedEventListener
+{
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        if ($eventName === 'getAvatar') {
+            $parameters['avatar'] = new FooAvatar($eventObj->getDecoratedObject());
+        } elseif ($eventName === 'isAccessible' && $parameters['name'] === 'fooPrivacySetting') {
+            $parameters['result'] = FooPrivacy::isAccessible($eventObj->userID, $parameters['userID']);
+        }
+    }
+}
+
+// Since 6.3
+EventHandler::getInstance()->register(
+    \wcf\event\user\UserAvatarLoading::class,
+    static function (\wcf\event\user\UserAvatarLoading $event) {
+        $event->setAvatar(new FooAvatar($event->user));
+    }
+);
+
+EventHandler::getInstance()->register(
+    \wcf\event\user\UserPrivacySettingChecking::class,
+    static function (\wcf\event\user\UserPrivacySettingChecking $event) {
+        if ($event->name === 'fooPrivacySetting') {
+            $event->setAccessible(FooPrivacy::isAccessible($event->user->userID, $event->viewerUserID));
+        }
+    }
+);
+```
+
+## Permissions and Profile Data of Users
+
+The permission checks for the administration of users are available as methods of `wcf\data\user\User`, which are used by the interactions, the RPC endpoints and the forms:
+
+- `isManageable(bool $allowSelf = false)` returns `true` if all user groups of the user are accessible to the active user and, unless `$allowSelf` is set, the user is not the active user.
+- `canEnable()`, `canConfirmEmail()`, `canBan()`, `canDisableAvatar()`, `canDisableCoverPhoto()`, `canDisableSignature()`, `canSendNewPassword()`, `canDisconnectThirdPartyLogin()`, `canDisableMultifactor()`, `canResendActivationMail()`, `canDelete()`, `canExportGdpr()` and `canMail()` check the permission for the respective action.
+
+The result of `canConfirmEmail()` can be modified through the PSR-14 event `wcf\event\user\UserEmailConfirmationChecking`.
+Do not confuse this method with the existing `canEmailConfirm()`, which checks whether the user can confirm the email address themselves.
+
+The avatar, the rank, the user title, the online status and the privacy settings are also available on `User` through `getAvatar()`, `getRank()`, `getUserTitle()`, `isOnline()` and `isAccessible()`, it is no longer necessary to create a `UserProfile` for these.
+The data required for these methods is loaded for all users of the same collection at once (`wcf\data\user\UserCollection`).
+The corresponding methods of `UserProfile` remain available.
+The constants `UserProfile::ACCESS_*` are aliases of the new constants `User::ACCESS_*`.
+
+## ACP User Add and Edit Form
+
+`wcf\acp\form\UserAddForm` and `wcf\acp\form\UserEditForm` have been migrated to the form builder and are based on `AbstractDatabaseObjectBuilderForm` using `UserBuilder`.
+All properties representing the form values and all template events of the `userAdd` template except for `contentHeaderNavigation` have been removed.
+The options to ban a user, to disable the avatar, cover photo and signature of a user, to disconnect a third party login and to disable the multi-factor authentication have been moved to the interactions on the edit page.
+
+Additional form fields can be added through the `createForm` event of `UserAddForm`, which is inherited by `UserEditForm`.
+The values are written into the builder using `saveValueCallback()` and read from the user using `loadValueCallback()`.
+
+```php
+final class FooUserAddFormListener implements IParameterizedEventListener
+{
+    public function execute($eventObj, $className, $eventName, array &$parameters)
+    {
+        $eventObj->form->getNodeById('general')->appendChild(
+            BooleanFormField::create('fooEnabled')
+                ->label('wcf.acp.user.fooEnabled')
+                ->saveValueCallback(static function (UserBuilder $builder, BooleanFormField $field) {
+                    $builder->setCustomProperty('fooEnabled', $field->getSaveValue());
+                })
+                ->loadValueCallback(static function (User $user, BooleanFormField $field) {
+                    $field->value($user->fooEnabled);
+                })
+        );
+    }
+}
+```
+
+```xml
+<eventlistener name="fooUserAddForm">
+	<environment>admin</environment>
+	<eventclassname>wcf\acp\form\UserAddForm</eventclassname>
+	<eventname>createForm</eventname>
+	<listenerclassname>wcf\system\event\listener\FooUserAddFormListener</listenerclassname>
+	<inherit>1</inherit>
+</eventlistener>
+```
+
+The form consists of the tab menu `userTabs` with the tabs `generalTab`, `profileTab`, `settingsTab` and `signatureTab`.
+The general data is contained in the form container `general`.
+Data that is stored in other tables can be saved using the `UserCreated` and `UserUpdated` events.
+
+`wcf\form\RegisterForm` and `wcf\form\SettingsForm` have also been migrated to the form builder and are now final.
+The template events `generalFields`, `honeyPotFields` and `sections` of the `register` template and `languageFields`, `styleFields`, `trophyFields` and `sections` of the `settings` template have been removed.
+
+## User List
+
+The user list in the ACP (`wcf\acp\page\UserListPage`) has been migrated to a [grid view](../../php/api/grid_views.md) (`wcf\system\gridView\admin\UserGridView`) and is now final.
+The bulk actions of the user list are provided as [bulk interactions](../../php/api/interactions.md#bulk-interactions) instead of the clipboard.
+The grid view, the interactions and the bulk interactions can be extended through the events `wcf\event\gridView\admin\UserGridViewInitialized`, `wcf\event\interaction\admin\UserInteractionCollecting` and `wcf\event\interaction\bulk\admin\UserBulkInteractionCollecting`.
+
+```php
+EventHandler::getInstance()->register(
+    \wcf\event\gridView\admin\UserGridViewInitialized::class,
+    static function (\wcf\event\gridView\admin\UserGridViewInitialized $event) {
+        $event->gridView->addColumnAfter(
+            GridViewColumn::for('fooCount')
+                ->label('wcf.acp.user.fooCount')
+                ->renderer(new NumberColumnRenderer())
+                ->sortable()
+                ->hidden(),
+            'lastActivityTime'
+        );
+        $event->gridView->addAvailableFilters([
+            new BooleanFilter('fooEnabled', 'wcf.acp.user.fooEnabled'),
+        ]);
+    }
+);
+
+EventHandler::getInstance()->register(
+    \wcf\event\interaction\bulk\admin\UserBulkInteractionCollecting::class,
+    static function (\wcf\event\interaction\bulk\admin\UserBulkInteractionCollecting $event) {
+        $event->provider->addInteraction(
+            new BulkLinkInteraction('foo', FooForm::class, 'wcf.acp.user.foo')
+        );
+    }
+);
+```
+
+The user search in the ACP (`wcf\acp\form\UserSearchForm`) and in the frontend (`wcf\form\UserSearchForm`) has been removed in favor of the filters of the user list and of the members list.
+Links to a filtered user list can be generated using the `filters` parameter, e.g. `UserList?filters[banned]=1`.
+The object type definition `com.woltlab.wcf.condition.userSearch` is deprecated and its object types are no longer used, use the `UserGridViewInitialized` event to add custom filters instead.
+
+The forms to assign users to groups, to export email addresses, to merge users and to revert content changes have been replaced by dialogs of the bulk interactions.
+
+## User Profile Header in the ACP
+
+The edit page of a user in the ACP shows the profile header of the user (`wcf\system\view\user\profile\AdminUserProfileHeaderView`), which provides the interactions of the user.
+The header fires the existing events `wcf\event\user\profile\UserProfileStatItemCollecting` and `wcf\event\user\profile\UserProfileHeaderSearchContentLinkCollecting`, which means that their listeners are also executed in the ACP.
+Links of stat items must be absolute, e.g. `$user->getLink() . '#foo'` instead of `#foo`.
+
+## User Options
+
+The user options have been migrated to [form options](../../php/api/form_builder/form_options.md), which provide the input field, the formatted output, the database column and the filter of an option.
+`wcf\data\user\option\UserOption` no longer extends `wcf\data\option\Option`.
+
+### Package Installation Plugin
+
+The value of `<optiontype>` in the [userOption PIP](../../package/pip/user-option.md) is the id of a form option.
+The legacy option types `aboutMe`, `message`, `multiSelect`, `URL` and `labeledUrl` are converted automatically, the fields `outputclass`, `enableoptions`, `contentpattern` and `messageObjectType` as well as arbitrary additional fields are ignored.
+Values of `checkboxes` options, including the default value, are separated by commas instead of newlines.
+
+The new option type `socialMedia` replaces `labeledUrl` and plain text options that contain the profile name on a social media platform:
+
+```xml
+<!-- Previously -->
+<option name="exampleMastodon">
+	<categoryname>profile.contact</categoryname>
+	<optiontype>text</optiontype>
+	<validationpattern>^$|^[A-Za-z0-9_]+$</validationpattern>
+	<outputclass>wcf\system\option\user\ExampleMastodonUserOptionOutput</outputclass>
+	<visible>15</visible>
+	<editable>3</editable>
+</option>
+
+<!-- Since 6.3 -->
+<option name="exampleMastodon">
+	<categoryname>profile.contact</categoryname>
+	<optiontype>socialMedia</optiontype>
+	<profileurlpattern>https://mastodon.social/@%s</profileurlpattern>
+	<profilenamepattern>^[A-Za-z0-9_]+$</profilenamepattern>
+	<visible>15</visible>
+	<editable>3</editable>
+</option>
+```
+
+Existing user options are converted during the upgrade to 6.3.
+
+### Custom Option Types
+
+Custom option types (`wcf\system\option\IOptionType`) and output classes (`wcf\system\option\user\IUserOptionOutput`) are no longer used for user options, options with an unknown type are treated as `text` options.
+Custom types must be implemented as a form option (`wcf\system\form\option\IFormOption`) and registered through the `wcf\event\form\option\FormOptionCollecting` event.
+The column of the option in `wcf1_user_option_value` is created based on `IFormOption::getDatabaseTableColumn()`.
+
+The new method `IFormOption::matchesFilterValue()` must be implemented by form options that do not extend `AbstractFormOption`.
+
+### Formatted Values
+
+The output classes have been replaced by `UserOption::getFormattedValue()`, `wcf\data\user\option\ViewableUserOption` is deprecated.
+
+```php
+// Previously
+$option = new ViewableUserOption($userOption);
+$option->setOptionValue($userProfile->getDecoratedObject());
+$output = $option->optionValue;
+
+// Since 6.3
+$output = $userProfile->getFormattedUserOption('foo');
+// or
+$output = $userOption->getFormattedValue($user->getUserOption('foo'), $user);
+```
+
+`UserProfile::getFormattedUserOption()` returns an empty string if the option has no value or is not visible to the active user, while `UserOption::getFormattedValue()` does not check the visibility.
+
+### Visibility and Editability
+
+`UserOption::setUser()` has been removed, the user is passed to `isVisible()` and `isEditable()` instead.
+This avoids side effects caused by modifying the shared option objects of the cache.
+
+```php
+// Previously
+$userOption->setUser($user);
+if ($userOption->isVisible()) {
+    // …
+}
+
+// Since 6.3
+if ($userOption->isVisible($user)) {
+    // …
+}
+```
+
+### Forms and Lists
+
+`wcf\system\option\user\UserOptionHandler`, `wcf\acp\form\UserOptionListForm` and the templates `userOptionFieldList` and `userProfileOptionFieldList` have been removed.
+The following traits provide the building blocks to integrate user options:
+
+- `wcf\system\option\user\TUserOptionsByCategory` returns the options of a category tree grouped by the subcategories (`getUserOptionsByCategory()`) and the title of a category (`getUserOptionCategoryTitle()`).
+- `wcf\system\form\option\user\TUserOptionFormFields` creates form containers and form fields for user options in forms based on `AbstractDatabaseObjectBuilderForm` using `UserBuilder`.
+- `wcf\system\option\user\TJoinUserOptionValues` joins the values of the user options to a database object list of users.
+
+```php
+final class FooForm extends AbstractDatabaseObjectBuilderForm
+{
+    use TUserOptionFormFields;
+
+    /**
+     * @var array<string, UserOption[]>
+     */
+    private array $options;
+
+    #[\Override]
+    public function readParameters(): void
+    {
+        parent::readParameters();
+
+        $this->formObject = new User(WCF::getUser()->userID);
+        $this->options = $this->getUserOptionsByCategory(
+            'settings.foo',
+            static fn(UserOption $option) => $option->validateOptions()
+                && $option->validatePermissions()
+                && $option->isEditable()
+        );
+    }
+
+    #[\Override]
+    protected function createForm(): void
+    {
+        parent::createForm();
+
+        $this->form->appendChildren($this->getUserOptionFormContainers($this->options));
+    }
+
+    #[\Override]
+    protected function getDatabaseObjectBuilder(): UserBuilder
+    {
+        return UserBuilder::forUpdate($this->formObject);
+    }
+
+    #[\Override]
+    protected function getCommand(DatabaseObjectBuilder $builder): callable
+    {
+        return new UpdateUser($builder);
+    }
+}
+```
+
+### Builders and Commands
+
+`UserOptionAction` and `UserOptionEditor` are deprecated in favor of `wcf\data\user\option\UserOptionBuilder` and the commands `CreateUserOption`, `UpdateUserOption` and `DeleteOption` in the `wcf\command\user\option` namespace.
+`UserOptionCategoryAction` and `UserOptionCategoryEditor` are deprecated in favor of `wcf\data\user\option\category\UserOptionCategoryBuilder` and the commands `CreateUserOptionCategory` and `UpdateUserOptionCategory`, which fire the events `UserOptionCategoryCreated` and `UserOptionCategoryUpdated`.
+
+The titles of user option categories are stored in the localized storage, use `UserOptionCategory::getTitle()` instead of the language item `wcf.user.option.category.{categoryName}`.
+The descriptions of user option categories are no longer displayed.
+
+### Filters
+
+User options of the `profile` category tree are automatically available as filters, which replace the user search and the `com.woltlab.wcf.userOptions` conditions:
+
+- the filters of the user list in the ACP, which also provides a hidden column for each option,
+- the filters of the members list for options that are `searchable` and visible to other users than the owner,
+- the object filters of ads, notices and automatic user group assignments (`wcf\system\object\filter\user\UserOptionObjectFilter`).
+
+No additional code is required, the filter is provided by the form option of the user option.
+
+## Grid View Column Visibility
+
+Grid views can allow users to select the visible columns, see [Column Visibility](../../php/api/grid_views.md#column-visibility).
+`AbstractGridViewPage` reads the selected columns from the `columns` parameter into the new property `$columns`, which may conflict with an existing property of the same name in a subclass.
diff --git a/docs/package/pip/user-option.md b/docs/package/pip/user-option.md
index 120cf0804..4c47985f3 100644
--- a/docs/package/pip/user-option.md
+++ b/docs/package/pip/user-option.md
@@ -1,27 +1,129 @@
 # User Option Package Installation Plugin
 
 Registers new user options (profile fields / user settings).
-The behaviour of this package installation plugin closely follows the [option](option.md) PIP.
+
+The input field and the output of a user option are provided by [form options](../../php/api/form_builder/form_options.md), the same infrastructure that is used for contact form options and other custom fields.
+User options of the `profile` category tree are also automatically available as filters in the user list of the ACP, in the members list (if they are `searchable`) and in object filters, e.g. for ads, notices and automatic user group assignments.
 
 ## Category Components
 
-The category definition works exactly like the option PIP.
+Each category is described as an `<category>` element with the mandatory attribute `name`.
+
+### `<parent>`
+
+<span class="label label-info">Optional</span>
+
+The category’s parent category.
+
+### `<showorder>`
+
+<span class="label label-info">Optional</span>
+
+Specifies the order of this category within the parent category.
+
+### `<options>`
+
+<span class="label label-info">Optional</span>
+
+The options element can contain a comma-separated list of options of which at least one needs to be enabled for the category to be shown.
+
+### `<permissions>`
+
+<span class="label label-info">Optional</span>
+
+The permissions element can contain a comma-separated list of permissions of which the active user needs to have at least one for the category to be shown.
 
 ## Option Components
 
-The fields `hidden`, `supporti18n` and `requirei18n` do not apply.
-The following extra fields are defined:
+Each option is described as an `<option>` element with the mandatory attribute `name`.
+
+### `<categoryname>`
+
+The option’s category.
+
+### `<optiontype>`
+
+The id of the [form option](../../php/api/form_builder/form_options.md) used for this option.
+The following form options are available out of the box:
+
+`boolean`, `checkboxes`, `currency`, `date`, `email`, `float`, `icon`, `integer`, `radioButton`, `rating`, `select`, `sourceCode`, `text`, `textarea`, `url`, `wysiwyg`
+
+Additionally, the following types are exclusive to user options:
+
+| Type          | Description |
+| ------------- | ----------- |
+| `socialMedia` | Profile name on a social media platform, see `<profilenamepattern>` and `<profileurlpattern>`. |
+| `birthday`    | Date of birth that respects the privacy setting for the year of birth and provides an age filter. |
+| `timezone`    | Reserved for the built-in time zone setting. |
+
+Additional types can be provided by registering a custom form option.
+
+The legacy types of WoltLab Suite 6.2 and earlier are converted automatically:
+
+| Legacy Type   | Form Option   |
+| ------------- | ------------- |
+| `aboutMe`     | `wysiwyg`     |
+| `message`     | `wysiwyg`     |
+| `multiSelect` | `checkboxes`  |
+| `URL`         | `url`         |
+| `labeledUrl`  | `socialMedia` |
+
+### `<defaultvalue>`
+
+<span class="label label-info">Optional</span>
+
+The value that is set for new users.
+Values of `checkboxes` options are separated by commas.
+
+### `<validationpattern>`
+
+<span class="label label-info">Optional</span>
+
+Defines a regular expression that is used to validate the value of a free form option (such as `text`).
+
+### `<selectoptions>`
+
+<span class="label label-info">Optional</span>
+
+Defines the selectable values of `select`, `radioButton` and `checkboxes` options.
+Each line contains one value in the format `{value}:{label}`, the label can be a language item.
+If a line does not contain a colon, the value is also used as the label.
+
+### `<profilenamepattern>`
+
+<span class="label label-info">Optional</span>
+
+Regular expression without delimiters that is used to validate the profile name of `socialMedia` options.
+
+### `<profileurlpattern>`
+
+<span class="label label-info">Optional</span>
+
+The URL of the profile of `socialMedia` options, `%s` is replaced with the profile name entered by the user.
+The pattern must contain `%s` exactly once and must be an absolute `http(s)` URL.
+
+### `<showorder>`
+
+<span class="label label-info">Optional</span>
+
+Specifies the order of this option within the category.
 
 ### `<required>`
 
+<span class="label label-info">Optional</span>
+
 Requires that a value is provided.
 
 ### `<askduringregistration>`
 
+<span class="label label-info">Optional</span>
+
 If set to `1` the field is shown during user registration in the frontend.
 
 ### `<editable>`
 
+<span class="label label-info">Optional</span>
+
 Bitfield with the following options (constants in `wcf\data\user\option\UserOption`)
 
 | Name                                     | Value |
@@ -32,6 +134,8 @@ Bitfield with the following options (constants in `wcf\data\user\option\UserOpti
 
 ### `<visible>`
 
+<span class="label label-info">Optional</span>
+
 Bitfield with the following options (constants in `wcf\data\user\option\UserOption`)
 
 | Name                     | Value |
@@ -43,24 +147,51 @@ Bitfield with the following options (constants in `wcf\data\user\option\UserOpti
 
 ### `<searchable>`
 
-If set to `1` the field is searchable.
+<span class="label label-info">Optional</span>
+
+If set to `1` the option is available as a filter in the members list.
+The filters of the user list in the ACP and the object filters include all options of the `profile` category tree regardless of this setting.
+
+### `<isdisabled>`
+
+<span class="label label-info">Optional</span>
+
+If set to `1` the option is disabled after the installation.
+
+### `<options>`
 
-### `<outputclass>`
+<span class="label label-info">Optional</span>
 
-PHP class responsible for output formatting of this field.
-the class has to implement the `wcf\system\option\user\IUserOptionOutput` interface.
+The options element can contain a comma-separated list of options of which at least one needs to be enabled for the option to be shown.
+
+### `<permissions>`
+
+<span class="label label-info">Optional</span>
+
+The permissions element can contain a comma-separated list of permissions of which the active user needs to have at least one for the option to be shown.
+
+### Unsupported Fields
+
+The fields `outputclass`, `enableoptions`, `contentpattern` and `messageObjectType` as well as arbitrary additional fields are no longer supported since WoltLab Suite 6.3 and are ignored.
 
 ## Language Items
 
 All relevant language items have to be put into the `wcf.user.option` language item category.
+The language items are synchronized into the localized storage of the user options during the installation.
 
 ### Categories
 
 If you install a category named `example`, you have to provide the language item `wcf.user.option.category.example`, which is used when displaying the options.
-If you want to provide an optional description of the category, you have to provide the language item `wcf.user.option.category.example.description`.
-Descriptions are only relevant for categories whose parent has a parent itself, i.e. categories on the third level.
 
 ### Options
 
 If you install an option named `exampleOption`, you have to provide the language item `wcf.user.option.exampleOption`, which is used as a label for setting the option value.
 If you want to provide an optional description of the option, you have to provide the language item `wcf.user.option.exampleOption.description`.
+
+## Example
+
+{jinja{ codebox(
+  title="userOption.xml",
+  language="xml",
+  filepath="package/pip/userOption.xml"
+) }}
diff --git a/docs/php/api/event_list.md b/docs/php/api/event_list.md
index 1e33af055..92f76a139 100644
--- a/docs/php/api/event_list.md
+++ b/docs/php/api/event_list.md
@@ -8,7 +8,6 @@ Events whose name is marked with an asterisk are called from a static method and
 |-------|------------|
 | `wcf\acp\action\UserExportGdprAction` | `export` |
 | `wcf\acp\form\StyleAddForm` | `setVariables` |
-| `wcf\acp\form\UserSearchForm` | `search` |
 | `wcf\action\AbstractAction` | `checkModules` |
 | `wcf\action\AbstractAction` | `checkPermissions` |
 | `wcf\action\AbstractAction` | `execute` |
@@ -24,8 +23,6 @@ Events whose name is marked with an asterisk are called from a static method and
 | `wcf\data\user\trophy\UserTrophy` | `getReplacements` |
 | `wcf\data\user\UserAction` | `beforeFindUsers` |
 | `wcf\data\user\UserAction` | `rename` |
-| `wcf\data\user\UserProfile` | `getAvatar` |
-| `wcf\data\user\UserProfile` | `isAccessible` |
 | `wcf\data\AbstractDatabaseObjectAction` | `finalizeAction` |
 | `wcf\data\AbstractDatabaseObjectAction` | `initializeAction` |
 | `wcf\data\AbstractDatabaseObjectAction` | `validateAction` |
diff --git a/docs/php/api/events.md b/docs/php/api/events.md
index c3bdf9bff..7c055cf8d 100644
--- a/docs/php/api/events.md
+++ b/docs/php/api/events.md
@@ -290,8 +290,18 @@ final class ValueDumpListener
 | `wcf\event\sitemap\SitemapObjectCollecting` | Requests the collection of objects that should be included in the sitemap. |
 | `wcf\event\spider\SpiderCollecting` | Requests the collection of spiders. |
 | `wcf\event\user\RegistrationSpamChecking` | Indicates that a registration by a new user is currently validated. If $matches is not empty, the registration is considered to be a spammer or an undesirable user. |
+| `wcf\event\user\UserAvatarLoading` | Indicates that the avatar of a user without an uploaded avatar is being loaded. Allows to provide a custom avatar, the default avatar is used if no avatar is set. |
+| `wcf\event\user\UserCreated` | Indicates that a user has been created. |
+| `wcf\event\user\UserDeleted` | Indicates that a user has been deleted. |
+| `wcf\event\user\UserEmailConfirmationChecking` | Indicates that it is being checked whether the active user can confirm or unconfirm the email address of a user. |
+| `wcf\event\user\UserPrivacySettingChecking` | Indicates that a privacy setting of a user is being checked for another user, e.g. whether the online status is visible to the viewer. |
+| `wcf\event\user\UserRenamed` | Indicates that a user has been renamed. Allows to register database columns containing the username that are updated automatically. |
+| `wcf\event\user\UserUpdated` | Indicates that a user has been updated. |
 | `wcf\event\user\UsernameValidating` | Indicates that a username is currently validated. If this event is interrupted, the username is considered to be invalid. This event will not be fired for usernames changed by an administrator. |
+| `wcf\event\user\UsersMerging` | Indicates that users are being merged into another user. Allows to register database columns referencing users that are reassigned automatically. |
 | `wcf\event\user\authentication\UserLoggedIn` | Indicates that the user actively logged in, i.e. that a user change happened in response to a user's request based off proper authentication. This event specifically must not be used if the active user is changed for technical reasons, e.g. when switching back to the real user after executing some logic with guest permissions. |
 | `wcf\event\user\authentication\configuration\ConfigurationLoading` | Indicates the loading of the user auth configuration. |
 | `wcf\event\user\menu\item\IconResolving` | Resolves the icon of a user menu item. |
+| `wcf\event\user\option\category\UserOptionCategoryCreated` | Indicates that a user option category has been created. |
+| `wcf\event\user\option\category\UserOptionCategoryUpdated` | Indicates that a user option category has been updated. |
 | `wcf\event\worker\RebuildWorkerCollecting` | Requests the collection of workers that should be included in the list of rebuild workers. |
diff --git a/docs/php/api/form_builder/form_fields.md b/docs/php/api/form_builder/form_fields.md
index 6eabdfcbd..edc0899a9 100644
--- a/docs/php/api/form_builder/form_fields.md
+++ b/docs/php/api/form_builder/form_fields.md
@@ -433,6 +433,26 @@ SingleSelectionFormField::create('example')
 ```
 
 
+### `SocialMediaFormField`
+
+`SocialMediaFormField` is a [text form field](#textformfield) to enter the name of a social media profile.
+If the link to the profile is entered instead, only the profile name is kept.
+The following methods are specific to this form field class:
+
+- `profileNamePattern($profileNamePattern)` and `getProfileNamePattern()` can be used to set and get a regular expression without delimiters that the profile name has to match.
+- `profileUrlPattern($profileUrlPattern)` and `getProfileUrlPattern()` can be used to set and get the URL of the profile, `%s` is replaced with the profile name.
+  The pattern is used to extract the profile name if a link to the profile is entered.
+
+Example:
+
+```php
+SocialMediaFormField::create('example')
+  ->label('foo.bar.example')
+  ->profileNamePattern('^[A-Za-z0-9_]+$')
+  ->profileUrlPattern('https://x.com/%s')
+```
+
+
 ### `SortOrderFormField`
 
 `SingleSelectionFormField` is a [single selection form field](#singleselectionformfield) with default id `sortOrder`, default label `wcf.global.showOrder` and default options `ASC: wcf.global.sortOrder.ascending` and `DESC: wcf.global.sortOrder.descending`.
@@ -514,7 +534,7 @@ TitleFormField::create()
 
 ### `UrlFormField`
 
-`UrlFormField` is a [text form field](#textformfield) whose values are checked via `Url::is()`.
+`UrlFormField` is a [text form field](#textformfield) whose values must be absolute URLs using the `http` or `https` scheme.
 
 Example:
 
diff --git a/docs/php/api/form_builder/form_options.md b/docs/php/api/form_builder/form_options.md
index e2b598789..b3aca0b2d 100644
--- a/docs/php/api/form_builder/form_options.md
+++ b/docs/php/api/form_builder/form_options.md
@@ -2,10 +2,13 @@
 
 Form options are the successor to the custom options that were previously used by the contact form and some other implementations.
 They offer a foundation for use cases where administrators need to set up custon form fields for users to provide data to.
-Built on top of the form builder they can be combined with any existing implementation by changing the base implementation to `AbstractFormOptionAddForm`.
+Built on top of the form builder they can be combined with any existing implementation by changing the base implementation to `AbstractFormOptionAddForm` or `AbstractFormOptionBuilderForm`.
 
 This features ship with a wide area of premade form fields that have been fully configured with configuration settings and formatting options.
-Additional form option types can be added through plugins utilizing the `wcf\event\form\option\SharedConfigurationFormFieldCollecting` event.
+Additional form option types can be added through plugins utilizing the `wcf\event\form\option\FormOptionCollecting` event.
+Additional configuration form fields that are shared between form option types can be added through the `wcf\event\form\option\SharedConfigurationFormFieldCollecting` event.
+
+Since version 6.3, user options are also based on form options.
 
 ## `AbstractFormOptionAddForm`
 
@@ -34,10 +37,35 @@ protected function createForm()
 }
 ```
 
+## `AbstractFormOptionBuilderForm`
+
+Since version 6.3, `AbstractFormOptionBuilderForm` provides the same functionality for forms based on `AbstractDatabaseObjectBuilderForm` that persist the options through a [database object builder](../../database-object-builder.md).
+The shared logic of both forms is provided by the `wcf\acp\form\TFormOptionAddForm` trait.
+
+The option type form field and the configuration form fields have to be appended in `createForm()` in the same way as for `AbstractFormOptionAddForm`.
+The values of the configuration form fields that apply to the selected option type are collected automatically and passed to `applyOptionType()`, which needs to write them into the builder.
+When editing an option, the configuration form fields are populated from the JSON-encoded `configuration` property of the object.
+
+```php
+#[\Override]
+protected function applyOptionType(DatabaseObjectBuilder $builder, string $optionType, array $configuration): void
+{
+    \assert($builder instanceof FooOptionBuilder);
+
+    $builder
+        ->setOptionType($optionType)
+        ->setConfiguration($configuration);
+}
+```
+
+The option types offered by the type selection can be customized by overriding `getAvailableFormOptions()` (all supported types) and `getSelectableFormOptions()` (types that can be selected for new options).
+
 ## `IFormOption`
 
 Apart from the list of predefined form options that ship with the software, developers can add own implementations that will be available with every form that is build on top of `AbstractFormOptionAddForm`.
 It offers a seamless integration into list views and grid views through `getFilterFormField()`, `renderFilterValue()` and `applyFilter()`.
+Since version 6.3, `matchesFilterValue()` is the equivalent of `applyFilter()` for a single value and is used by object filters, `AbstractFormOption` provides a default implementation that compares the values for equality.
+The column used to store the values is defined by `getDatabaseTableColumn()`, which is also used to create the columns of user options.
 
 For a full documentation of the required methods please see the `IFormOption` interface.
 
@@ -51,3 +79,9 @@ We highly suggest that you take a look at the implementation of the contact form
 - `wcf\data\contact\option\ContactOption` implements `getFormOption()` and `getConfiguration()` to work with form options.
 - `wcf\form\ContactForm` creates the form fields from the options in `getOptionFormFields()`.
 - `wcf\command\contact\form\SubmitContactForm` converts the values from the user input to the formatted versions in `getFormattedOptionValues()` for use in HTML and plaintext emails.
+
+The user options are an example of an implementation based on `AbstractFormOptionBuilderForm`:
+
+- `wcf\acp\form\UserOptionAddForm` manages adding of user options.
+- `wcf\data\user\option\UserOption` implements `getFormOption()`, `getConfiguration()` and `getFormattedValue()`.
+- `wcf\system\form\option\user\TUserOptionFormFields` creates the form fields from the user options.
diff --git a/docs/php/api/grid_views.md b/docs/php/api/grid_views.md
index 6894860dd..160c63ee7 100644
--- a/docs/php/api/grid_views.md
+++ b/docs/php/api/grid_views.md
@@ -332,6 +332,38 @@ class ExampleGridView extends AbstractGridView
 }
 ```
 
+### Column Visibility
+
+Columns can be hidden by default using the `hidden` method.
+If the grid view is column configurable, the user can select the visible columns through a dialog in the filter bar, which also allows to show the columns that are hidden by default.
+
+```php
+class ExampleGridView extends AbstractGridView
+{
+    public function __construct()
+    {
+        $this->addColumns([
+            GridViewColumn::for('title')
+                ->label('wcf.global.title')
+                ->titleColumn(),
+            GridViewColumn::for('time')
+                ->label('wcf.global.date')
+                ->renderer(new TimeColumnRenderer()),
+            GridViewColumn::for('views')
+                ->label('wcf.example.views')
+                ->renderer(new NumberColumnRenderer())
+                ->hidden(),
+        ]);
+
+        $this->setColumnConfigurable();
+    }
+}
+```
+
+The title column (see `titleColumn()`) is always visible and cannot be hidden by the user.
+The selected columns are not persisted, but they are part of the URL of the page (`columns[]` parameter).
+In grid views that are not column configurable, hidden columns are never shown.
+
 
 ### Additional Parameters
 
diff --git a/docs/php/api/interactions.md b/docs/php/api/interactions.md
index c3cf6e788..fe20d4289 100644
--- a/docs/php/api/interactions.md
+++ b/docs/php/api/interactions.md
@@ -256,6 +256,18 @@ new LinkInteraction(
 )
 ```
 
+`BulkLinkInteraction` links to the given controller and passes the ids of the selected objects in the `ids` parameter.
+Additional parameters of the link can be passed as the last parameter.
+
+```php
+new BulkLinkInteraction(
+    'id',
+    ExampleForm::class,
+    'label',
+    parameters: ['foo' => 'bar']
+)
+```
+
 ### `RestoreInteraction`
 
 Uses an RPC endpoint to restore an object after a confirmation prompt.
diff --git a/docs/php/api/rpc_api.md b/docs/php/api/rpc_api.md
index 9a46dd94c..d3160468d 100644
--- a/docs/php/api/rpc_api.md
+++ b/docs/php/api/rpc_api.md
@@ -125,6 +125,20 @@ The attribute expects a single parameter to define the endpoint’s route.
 
 The route implementation uses [FastRoute](https://github.com/nikic/FastRoute) which supports named placeholders through the `{name}` syntax. Optionally, a validation pattern can be specified to further narrow down the valid value of the placeholder: `{id:\d+}`
 
+### Availability During “Force Login”
+
+If the “force login” option is enabled, guests and users awaiting activation are not permitted to access any endpoints and receive a `403 Permission Denied` response with the code `force_login`.
+Endpoints that are required before logging in, for example to support the registration process, can opt out of this restriction using the `wcf\system\endpoint\AvailableDuringForceLogin` class attribute.
+
+```php
+#[PostRequest('/core/users/validate-username')]
+#[AvailableDuringForceLogin]
+final class ValidateUsername implements IController
+{
+    // …
+}
+```
+
 ### Registering of an Endpoint
 
 Custom endpoints can be registered via the `ControllerCollecting` event in the [bootstrap script](../../package/bootstrap-scripts.md) of a package.
diff --git a/docs/php/api/rpc_api_endpoints.md b/docs/php/api/rpc_api_endpoints.md
index 46667f310..07cdaf46a 100644
--- a/docs/php/api/rpc_api_endpoints.md
+++ b/docs/php/api/rpc_api_endpoints.md
@@ -82,6 +82,7 @@
 | DisableCronjob | Post | /core/cronjobs/{id:\d+}/disable  | Disables the cronjob with the given ID. |
 | EnableCronjob | Post | /core/cronjobs/{id:\d+}/enable  | Enables the cronjob with the given ID. |
 | ExecuteCronjob | Post | /core/cronjobs/{id:\d+}/execute  | Executes the cronjob with the given ID. |
+| SetLanguage | Post | /core/devtools/set-language  | Sets the language of the active user in the developer tools. |
 | RenderException | Get | /core/exceptions/{id:[a-f0-9]{40}}/render  | Retrieves the HTML code for the rendering of the exception log entry with the given ID. |
 | PrepareUpload | Post | /core/files/upload  | Prepares the upload of a file. |
 | SaveChunk | Post | /core/files/upload/{identifier}/chunk/{sequenceNo:\d+}  | Reads a chunk of a file upload. |
@@ -165,7 +166,29 @@
 | DisableOption | Post | /core/users/options/{id:\d+}/disable  | Disables the user option with the given ID. |
 | EnableOption | Post | /core/users/options/{id:\d+}/enable  | Enables the user option with the given ID. |
 | DeleteUserRank | Delete | /core/users/ranks/{id:\d+}  | Deletes the user rank with the given ID. |
+| RenderSignaturePreview | Post | /core/users/signature/preview  | Renders a preview of the signature of the active user. |
 | DeleteUserTrophy | Delete | /core/users/trophies/{id:\d+}  | Deletes the user trophy with the given ID. |
+| SaveUserConsent | Post | /core/users/user-consent  | Saves the consent of the active user to load external media. |
+| ValidateEmail | Post | /core/users/validate-email  | Validates an email address for the registration, also available while the “force login” option is enabled. |
+| ValidateUsername | Post | /core/users/validate-username  | Validates a username for the registration, also available while the “force login” option is enabled. |
+| DeleteUser | Delete | /core/users/{id:\d+}  | Deletes the user with the given ID. |
+| GetUserActivityPointList | Get | /core/users/{id:\d+}/activity-points  | Retrieves the HTML code of the detailed activity points of the user with the given ID. |
+| GetAdminUserProfileHeader | Get | /core/users/{id:\d+}/admin-profile-header  | Retrieves the HTML code of the profile header of the user with the given ID in the ACP. |
+| ConfirmUserEmail | Post | /core/users/{id:\d+}/confirm-email  | Confirms the email address of the user with the given ID. |
+| DisableUser | Post | /core/users/{id:\d+}/disable  | Disables the user with the given ID. |
+| DisableUserMultifactor | Post | /core/users/{id:\d+}/disable-multifactor  | Disables the multi-factor authentication of the user with the given ID. |
+| DisconnectThirdPartyLogin | Post | /core/users/{id:\d+}/disconnect-third-party-login  | Disconnects the third party login of the user with the given ID. |
+| EnableUser | Post | /core/users/{id:\d+}/enable  | Enables the user with the given ID. |
+| EnableUserAvatar | Post | /core/users/{id:\d+}/enable-avatar  | Enables the avatar of the user with the given ID. |
+| EnableUserCoverPhoto | Post | /core/users/{id:\d+}/enable-cover-photo  | Enables the cover photo of the user with the given ID. |
+| EnableUserSignature | Post | /core/users/{id:\d+}/enable-signature  | Enables the signature of the user with the given ID. |
+| GetUserPopover | Get | /core/users/{id:\d+}/popover  | Retrieves the HTML code for the popover of the user with the given ID. |
+| RenderUserProfileMenuContent | Get | /core/users/{id:\d+}/profile-menu-content  | Retrieves the HTML code of a user profile tab of the user with the given ID. |
+| RenderUserReactions | Get | /core/users/{id:\d+}/reactions/render  | Retrieves the HTML code for the rendering of the list of reactions for a user profile. |
+| ResendActivationMail | Post | /core/users/{id:\d+}/resend-activation-mail  | Resends the activation mail to the user with the given ID. |
+| SendNewPassword | Post | /core/users/{id:\d+}/send-new-password  | Sends a new password to the user with the given ID. |
+| UnbanUser | Post | /core/users/{id:\d+}/unban  | Unbans the user with the given ID. |
+| UnconfirmUserEmail | Post | /core/users/{id:\d+}/unconfirm-email  | Unconfirms the email address of the user with the given ID. |
 | RevertVersion | Post | /core/version-trackers/revert  | Reverts a version tracker object to a previous version. |
 | GetFilePopover | Get | /filebase/files/{id:\d+}/popover  | Retrieves the HTML code for the popover of the filebase file with the given ID. |
 | DeleteLicense | Delete | /filebase/licenses/{id:\d+}  | Deletes the filebase license with the given ID. |
diff --git a/docs/php/database-object-builder.md b/docs/php/database-object-builder.md
index b5130466b..6c75028ee 100644
--- a/docs/php/database-object-builder.md
+++ b/docs/php/database-object-builder.md
@@ -107,6 +107,8 @@ It cannot be used together with `forUpdate()`.
 `setCustomProperty(string $name, string|int|float|null $value)` writes an arbitrary column that has no dedicated setter.
 This is primarily used to let third-party packages persist columns they added to the table, for example the `additionalFields` collected by a form (see [Use case: Form Builder forms](#use-case-form-builder-forms)).
 
+`incrementCustomProperty(string $name, int|float $value)` is the equivalent for counter columns without a dedicated increment method, the value is added to the current value of the column (see [Incrementing counters](#incrementing-counters)).
+
 
 ## Implementing a Builder
 
diff --git a/docs/tutorial/series/part_5.md b/docs/tutorial/series/part_5.md
index 5ce0d6988..cee0b9d5b 100644
--- a/docs/tutorial/series/part_5.md
+++ b/docs/tutorial/series/part_5.md
@@ -33,6 +33,8 @@ The package will have the following file structure _excluding_ unchanged files f
 │   │           └── Controller
 │   │               └── Person.js
 │   └── lib
+│       ├── bootstrap
+│       │   └── com.woltlab.wcf.people.php
 │       ├── data
 │       │   └── person
 │       │       ├── Person.class.php
@@ -216,22 +218,16 @@ filepath="tutorial/tutorial-series/part-5/files/lib/system/worker/PersonRebuildD
 
 As we store the name of the user who create a new piece of information and store their IP address, we have to add event listeners to properly handle the following scenarios:
 
-1. If the user is renamed, the value of `username` stored with the person information has to be updated, which can be achieved by a simple event listener that only has to specify the name of relevant database table if `AbstractUserActionRenameListener` is extended:
-
-    {jinja{ codebox(
-        title="files/lib/system/event/listener/PersonUserActionRenameListener.class.php",
-        language="php",
-        filepath="tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserActionRenameListener.class.php"
-    ) }}
-2. If users are merged, all pieces of information need to be assigned to the target user of the merging.
-  Again, we only have to specify the name of relevant database table if `AbstractUserMergeListener` is extended:
+1. If the user is renamed, the value of `username` stored with the person information has to be updated.
+  If users are merged, all pieces of information need to be assigned to the target user of the merging.
+  Both are handled by event listeners for the `UserRenamed` and `UsersMerging` events in the bootstrap script that only have to specify the name of the relevant database table and the column containing the username:
 
    {jinja{ codebox(
-       title="files/lib/system/event/listener/PersonUserMergeListener.class.php",
+       title="files/lib/bootstrap/com.woltlab.wcf.people.php",
        language="php",
-       filepath="tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserMergeListener.class.php"
+       filepath="tutorial/tutorial-series/part-5/files/lib/bootstrap/com.woltlab.wcf.people.php"
    ) }}
-3. If the option to prune stored ip addresses after a certain period of time is enabled, we also have to prune them in the person information database table.
+2. If the option to prune stored ip addresses after a certain period of time is enabled, we also have to prune them in the person information database table.
   Here we also only have to specify the name of the relevant database table and provide the mapping from the `ipAddress` column to the `time` column:
 
    {jinja{ codebox(
@@ -239,7 +235,7 @@ As we store the name of the user who create a new piece of information and store
        language="php",
        filepath="tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonPruneIpAddressesCronjobListener.class.php"
    ) }}
-4. The ip addresses in the person information database table also have to be considered for the user data export which can also be done with minimal effort by providing the name of the relevant database table:
+3. The ip addresses in the person information database table also have to be considered for the user data export which can also be done with minimal effort by providing the name of the relevant database table:
 
    {jinja{ codebox(
        title="files/lib/system/event/listener/PersonUserExportGdprListener.class.php",
@@ -247,7 +243,7 @@ As we store the name of the user who create a new piece of information and store
        filepath="tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserExportGdprListener.class.php"
    ) }}
 
-Lastly, we present the updated `eventListener.xml` file with new entries for all of these event listeners:
+Lastly, we present the updated `eventListener.xml` file with new entries for the remaining event listeners:
 
 {jinja{ codebox(
   title="eventListener.xml",
diff --git a/snippets/package/pip/userOption.xml b/snippets/package/pip/userOption.xml
new file mode 100644
index 000000000..bd7fd0ead
--- /dev/null
+++ b/snippets/package/pip/userOption.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/6.0/userOption.xsd">
+	<import>
+		<categories>
+			<category name="profile.example">
+				<parent>profile</parent>
+				<showorder>5</showorder>
+			</category>
+		</categories>
+		<options>
+			<option name="exampleFavoriteColor">
+				<categoryname>profile.example</categoryname>
+				<optiontype>select</optiontype>
+				<defaultvalue>red</defaultvalue>
+				<selectoptions>red:wcf.user.option.exampleFavoriteColor.red
+green:wcf.user.option.exampleFavoriteColor.green
+blue:wcf.user.option.exampleFavoriteColor.blue</selectoptions>
+				<searchable>1</searchable>
+				<visible>15</visible>
+				<editable>3</editable>
+			</option>
+			<option name="exampleMastodon">
+				<categoryname>profile.example</categoryname>
+				<optiontype>socialMedia</optiontype>
+				<profilenamepattern>^[A-Za-z0-9_]+$</profilenamepattern>
+				<profileurlpattern>https://mastodon.social/@%s</profileurlpattern>
+				<visible>15</visible>
+				<editable>3</editable>
+			</option>
+		</options>
+	</import>
+	<delete>
+		<option name="exampleObsoleteOption"/>
+	</delete>
+</data>
diff --git a/snippets/tutorial/tutorial-series/part-5/eventListener.xml b/snippets/tutorial/tutorial-series/part-5/eventListener.xml
index fbbc0a588..723656987 100644
--- a/snippets/tutorial/tutorial-series/part-5/eventListener.xml
+++ b/snippets/tutorial/tutorial-series/part-5/eventListener.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/eventListener.xsd">
 	<import>
-		<eventlistener name="rename@wcf\data\user\UserAction">
-			<eventclassname>wcf\data\user\UserAction</eventclassname>
-			<eventname>rename</eventname>
-			<listenerclassname>wcf\system\event\listener\PersonUserActionRenameListener</listenerclassname>
-			<environment>all</environment>
-		</eventlistener>
-		<eventlistener name="save@wcf\acp\form\UserMergeForm">
-			<eventclassname>wcf\acp\form\UserMergeForm</eventclassname>
-			<eventname>save</eventname>
-			<listenerclassname>wcf\system\event\listener\PersonUserMergeListener</listenerclassname>
-			<environment>admin</environment>
-		</eventlistener>
 		<eventlistener name="execute@wcf\system\cronjob\PruneIpAddressesCronjob">
 			<eventclassname>wcf\system\cronjob\PruneIpAddressesCronjob</eventclassname>
 			<eventname>execute</eventname>
diff --git a/snippets/tutorial/tutorial-series/part-5/files/lib/bootstrap/com.woltlab.wcf.people.php b/snippets/tutorial/tutorial-series/part-5/files/lib/bootstrap/com.woltlab.wcf.people.php
new file mode 100644
index 000000000..758339bb0
--- /dev/null
+++ b/snippets/tutorial/tutorial-series/part-5/files/lib/bootstrap/com.woltlab.wcf.people.php
@@ -0,0 +1,61 @@
+<?php
+
+use wcf\acp\form\PersonAddForm;
+use wcf\acp\page\PersonListPage;
+use wcf\event\acp\menu\item\ItemCollecting;
+use wcf\event\endpoint\ControllerCollecting;
+use wcf\event\user\UserRenamed;
+use wcf\event\user\UsersMerging;
+use wcf\system\event\EventHandler;
+use wcf\system\menu\acp\AcpMenuItem;
+use wcf\system\request\LinkHandler;
+use wcf\system\style\FontAwesomeIcon;
+use wcf\system\WCF;
+
+return static function (): void {
+    EventHandler::getInstance()->register(
+        ItemCollecting::class,
+        static function (ItemCollecting $event) {
+            if (!WCF::getSession()->getPermission('admin.content.canManagePeople')) {
+                return;
+            }
+
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.person',
+                parentMenuItem: 'wcf.acp.menu.link.content'
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.person.list',
+                parentMenuItem: 'wcf.acp.menu.link.person',
+                link: LinkHandler::getInstance()->getControllerLink(PersonListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.person.add',
+                parentMenuItem: 'wcf.acp.menu.link.person.list',
+                link: LinkHandler::getInstance()->getControllerLink(PersonAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    );
+
+    EventHandler::getInstance()->register(
+        ControllerCollecting::class,
+        static function (ControllerCollecting $event) {
+            $event->register(new \wcf\system\endpoint\controller\core\persons\DeletePerson());
+        }
+    );
+
+    EventHandler::getInstance()->register(
+        UsersMerging::class,
+        static function (UsersMerging $event) {
+            $event->reassignUserColumn('wcf1_person_information', usernameColumn: 'username');
+        }
+    );
+
+    EventHandler::getInstance()->register(
+        UserRenamed::class,
+        static function (UserRenamed $event) {
+            $event->updateUsernameColumn('wcf1_person_information');
+        }
+    );
+};
diff --git a/snippets/tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserActionRenameListener.class.php b/snippets/tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserActionRenameListener.class.php
deleted file mode 100644
index 73b0b09a3..000000000
--- a/snippets/tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserActionRenameListener.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace wcf\system\event\listener;
-
-/**
- * Updates person information during user renaming.
- *
- * @author  Matthias Schmidt
- * @copyright   2001-2022 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-final class PersonUserActionRenameListener extends AbstractUserActionRenameListener
-{
-    /**
-     * @inheritDoc
-     */
-    protected $databaseTables = [
-        'wcf{WCF_N}_person_information',
-    ];
-}
diff --git a/snippets/tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserMergeListener.class.php b/snippets/tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserMergeListener.class.php
deleted file mode 100644
index 0cf9c8338..000000000
--- a/snippets/tutorial/tutorial-series/part-5/files/lib/system/event/listener/PersonUserMergeListener.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace wcf\system\event\listener;
-
-/**
- * Updates person information during user merging.
- *
- * @author  Matthias Schmidt
- * @copyright   2001-2022 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-final class PersonUserMergeListener extends AbstractUserMergeListener
-{
-    /**
-     * @inheritDoc
-     */
-    protected $databaseTables = [
-        'wcf{WCF_N}_person_information',
-    ];
-}
diff --git a/snippets/tutorial/tutorial-series/part-6/eventListener.xml b/snippets/tutorial/tutorial-series/part-6/eventListener.xml
index 61be2bac4..76d88b817 100644
--- a/snippets/tutorial/tutorial-series/part-6/eventListener.xml
+++ b/snippets/tutorial/tutorial-series/part-6/eventListener.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/eventListener.xsd">
 	<import>
-		<eventlistener name="rename@wcf\data\user\UserAction">
-			<eventclassname>wcf\data\user\UserAction</eventclassname>
-			<eventname>rename</eventname>
-			<listenerclassname>wcf\system\event\listener\PersonUserActionRenameListener</listenerclassname>
-			<environment>all</environment>
-		</eventlistener>
-		<eventlistener name="save@wcf\acp\form\UserMergeForm">
-			<eventclassname>wcf\acp\form\UserMergeForm</eventclassname>
-			<eventname>save</eventname>
-			<listenerclassname>wcf\system\event\listener\PersonUserMergeListener</listenerclassname>
-			<environment>admin</environment>
-		</eventlistener>
 		<eventlistener name="execute@wcf\system\cronjob\PruneIpAddressesCronjob">
 			<eventclassname>wcf\system\cronjob\PruneIpAddressesCronjob</eventclassname>
 			<eventname>execute</eventname>
diff --git a/snippets/tutorial/tutorial-series/part-6/files/lib/bootstrap/com.woltlab.wcf.people.php b/snippets/tutorial/tutorial-series/part-6/files/lib/bootstrap/com.woltlab.wcf.people.php
new file mode 100644
index 000000000..758339bb0
--- /dev/null
+++ b/snippets/tutorial/tutorial-series/part-6/files/lib/bootstrap/com.woltlab.wcf.people.php
@@ -0,0 +1,61 @@
+<?php
+
+use wcf\acp\form\PersonAddForm;
+use wcf\acp\page\PersonListPage;
+use wcf\event\acp\menu\item\ItemCollecting;
+use wcf\event\endpoint\ControllerCollecting;
+use wcf\event\user\UserRenamed;
+use wcf\event\user\UsersMerging;
+use wcf\system\event\EventHandler;
+use wcf\system\menu\acp\AcpMenuItem;
+use wcf\system\request\LinkHandler;
+use wcf\system\style\FontAwesomeIcon;
+use wcf\system\WCF;
+
+return static function (): void {
+    EventHandler::getInstance()->register(
+        ItemCollecting::class,
+        static function (ItemCollecting $event) {
+            if (!WCF::getSession()->getPermission('admin.content.canManagePeople')) {
+                return;
+            }
+
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.person',
+                parentMenuItem: 'wcf.acp.menu.link.content'
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.person.list',
+                parentMenuItem: 'wcf.acp.menu.link.person',
+                link: LinkHandler::getInstance()->getControllerLink(PersonListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.person.add',
+                parentMenuItem: 'wcf.acp.menu.link.person.list',
+                link: LinkHandler::getInstance()->getControllerLink(PersonAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    );
+
+    EventHandler::getInstance()->register(
+        ControllerCollecting::class,
+        static function (ControllerCollecting $event) {
+            $event->register(new \wcf\system\endpoint\controller\core\persons\DeletePerson());
+        }
+    );
+
+    EventHandler::getInstance()->register(
+        UsersMerging::class,
+        static function (UsersMerging $event) {
+            $event->reassignUserColumn('wcf1_person_information', usernameColumn: 'username');
+        }
+    );
+
+    EventHandler::getInstance()->register(
+        UserRenamed::class,
+        static function (UserRenamed $event) {
+            $event->updateUsernameColumn('wcf1_person_information');
+        }
+    );
+};
diff --git a/snippets/tutorial/tutorial-series/part-6/files/lib/system/event/listener/PersonUserActionRenameListener.class.php b/snippets/tutorial/tutorial-series/part-6/files/lib/system/event/listener/PersonUserActionRenameListener.class.php
deleted file mode 100644
index 73b0b09a3..000000000
--- a/snippets/tutorial/tutorial-series/part-6/files/lib/system/event/listener/PersonUserActionRenameListener.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace wcf\system\event\listener;
-
-/**
- * Updates person information during user renaming.
- *
- * @author  Matthias Schmidt
- * @copyright   2001-2022 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-final class PersonUserActionRenameListener extends AbstractUserActionRenameListener
-{
-    /**
-     * @inheritDoc
-     */
-    protected $databaseTables = [
-        'wcf{WCF_N}_person_information',
-    ];
-}
diff --git a/snippets/tutorial/tutorial-series/part-6/files/lib/system/event/listener/PersonUserMergeListener.class.php b/snippets/tutorial/tutorial-series/part-6/files/lib/system/event/listener/PersonUserMergeListener.class.php
deleted file mode 100644
index 0cf9c8338..000000000
--- a/snippets/tutorial/tutorial-series/part-6/files/lib/system/event/listener/PersonUserMergeListener.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace wcf\system\event\listener;
-
-/**
- * Updates person information during user merging.
- *
- * @author  Matthias Schmidt
- * @copyright   2001-2022 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-final class PersonUserMergeListener extends AbstractUserMergeListener
-{
-    /**
-     * @inheritDoc
-     */
-    protected $databaseTables = [
-        'wcf{WCF_N}_person_information',
-    ];
-}