Merge "Pass the right username to 'tool-link-userrights' / 'tool-link-userrights...