Apply patch from comment 87

Pierre Rudloffrequested to merge
issue/drupal-849602:849602-update-username-theme into main

Closes #849602

Merge request reports