diff --git a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java index d507130a18ee73945fb668c8f5faf5e713937c68..4be32fb27301c1880bb1b9f2ab3e7c92b4519682 100644 --- a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -307,12 +307,10 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas if ((request.getUsername() == null) || request.getUsername().isEmpty()) { validation.addError(new ValidationError("Missing username.", Cause.MISSING_USERNAME)); - } - if (!account.isValidUsername(request.getUsername())) { + } else if (!account.isValidUsername(request.getUsername())) { validation.addError( new ValidationError("Invalid username. Value: " + request.getUsername(), Cause.INVALID_USERNAME)); } - return validation; }