diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java
index f1eb2e0..e738c6f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java
@@ -61,15 +61,18 @@
       return byId.get(Account.Id.parse(nameOrEmail)).getAccount();
     }
 
+    if (nameOrEmail.matches(Account.USER_NAME_PATTERN)) {
+      Account who = findByUserName(nameOrEmail);
+      if (who != null) {
+        return who;
+      }
+    }
+
     Account account = findByNameOrEmail(nameOrEmail);
     if (account != null) {
       return account;
     }
 
-    if (nameOrEmail.matches(Account.USER_NAME_PATTERN)) {
-      return findByUserName(nameOrEmail);
-    }
-
     return null;
   }