Bug: setup: User Overwritten - Loss of Selected User (Tested in Versions 20.0.1 to 21.0.1) with userlist

[gschratzer]

Loading this page is changing the current user on the index.php site /marketplace/admin/setup.php
Problem then also that the changes after const MARKETPLACE_USER_MANAGE_WEBSITE are not saved anymore

On the Marketplace setup page, the initially loaded user list (obtained via the select_dolusers() method) gets overwritten. This appears to be caused by the following code block:

$userList = ['-1' => ''];
foreach ($userModel->users as $user) {
$userList[$user->id] = $user->login;
}

Disabling these lines prevents the loss of the previously selected user. It seems that the user data from select_dolusers() is being replaced, rather than extended or preserved. and the setup saves the changes again.
My User changed to the last user->id User (last added Username)