Advanced Preview: username displayed in the toolbar + incorrect username in the template

I am currently logued with a LDAP user (ADUMAS). Then I use the advanced preview mode in order to preview my page with the guest user.

1) the toolbar now indicates "guest" as the login name. This is quite confusing as my "principal" is still ADUMAS. So I would prefer that we display something like : "ADUMAS (guest)"

2) there is a problem with the user information within the community template (top right information) as they still indicate ADUMAS while it should indicate guest (or nothing at all in the case of guest)