diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
index 652ccb3..51d81c9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ListUsersCommand.java
@@ -70,8 +70,7 @@
           new StringBuilder()
               .append(account.id().toString())
               .append(" |")
-              .append(
-                  accountState.userName().isPresent() ? "" : " " + accountState.userName().get())
+              .append(accountState.userName().map(userName -> " " + userName).orElse(""))
               .append(" |")
               .append(Strings.isNullOrEmpty(account.fullName()) ? "" : " " + account.fullName())
               .append(" |")