- if (currentPageUser != null) {
- vars.put("loggedInAs", currentPageUser.getName().toString());
+ if (currentAuthContext != null) {
+ CertificateOwner target = currentAuthContext.getTarget();
+ User currentPageUser = LoginPage.getUser(req);
+ if (target != currentPageUser) {
+ vars.put("loggedInAs", ((Organisation) target).getName() + " (" + currentPageUser.getName().toString() + ")");
+ } else {
+ vars.put("loggedInAs", currentPageUser.getName().toString());
+ }