@@ -21,6 +21,7 @@
 
 use function __;
 use function header;
+use function htmlspecialchars;
 use function implode;
 use function is_array;
 use function is_string;
@@ -160,7 +161,10 @@ public function __invoke(ServerRequest $request): void
         /**
          * Changes / copies a user, part I
          */
-        $password = $serverPrivileges->getDataForChangeOrCopyUser();
+        $password = $serverPrivileges->getDataForChangeOrCopyUser(
+            $request->getParsedBodyParam('old_username', ''),
+            $request->getParsedBodyParam('old_hostname', '')
+        );
 
         /**
          * Adds a user
@@ -192,7 +196,9 @@ public function __invoke(ServerRequest $request): void
             $queries = $serverPrivileges->getDbSpecificPrivsQueriesForChangeOrCopyUser(
                 $queries,
                 $GLOBALS['username'],
-                $GLOBALS['hostname']
+                $GLOBALS['hostname'],
+                $request->getParsedBodyParam('old_username'),
+                $request->getParsedBodyParam('old_hostname')
             );
         }
 
@@ -337,9 +343,19 @@ public function __invoke(ServerRequest $request): void
 
         // export user definition
         if ($request->hasQueryParam('export') || $request->getParsedBodyParam('submit_mult') === 'export') {
-            [$title, $export] = $serverPrivileges->getListForExportUserDefinition(
+            /** @var string[]|null $selectedUsers */
+            $selectedUsers = $request->getParsedBodyParam('selected_usr');
+
+            $title = $this->getExportPageTitle(
                 $GLOBALS['username'] ?? '',
-                $GLOBALS['hostname'] ?? ''
+                $GLOBALS['hostname'] ?? '',
+                $selectedUsers
+            );
+
+            $export = $serverPrivileges->getExportUserDefinitionTextarea(
+                $GLOBALS['username'] ?? '',
+                $GLOBALS['hostname'] ?? '',
+                $selectedUsers
             );
 
             unset($GLOBALS['username'], $GLOBALS['hostname']);
@@ -380,7 +396,10 @@ public function __invoke(ServerRequest $request): void
             if (! isset($GLOBALS['username'])) {
                 // No username is given --> display the overview
                 $this->response->addHTML(
-                    $serverPrivileges->getHtmlForUserOverview($GLOBALS['text_dir'])
+                    $serverPrivileges->getHtmlForUserOverview(
+                        $GLOBALS['text_dir'],
+                        $request->getQueryParam('initial', '')
+                    )
                 );
             } elseif (! empty($routinename)) {
                 $this->response->addHTML(
@@ -419,4 +438,14 @@ public function __invoke(ServerRequest $request): void
 
         $this->response->addHTML('</div>');
     }
+
+    private function getExportPageTitle(string $username, string $hostname, ?array $selectedUsers): string
+    {
+        if ($selectedUsers !== null) {
+            return __('Privileges');
+        }
+
+        return __('User') . ' `' . htmlspecialchars($username)
+            . '`@`' . htmlspecialchars($hostname) . '`';
+    }
 }