diff --git a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index d25ea39..61d3258 100644
--- a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -619,17 +619,20 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
ret.put("error", "Group permission already exists.");
return;
}
- }
- else {
- if (!userManager.validateUser(name)) {
- ret.put("error", "User is invalid.");
+ if (!userManager.validateGroup(name)) {
+ ret.put("error", "Group is invalid.");
return;
}
-
+ }
+ else {
if (project.getUserPermission(name) != null) {
ret.put("error", "User permission already exists.");
return;
}
+ if (!userManager.validateUser(name)) {
+ ret.put("error", "User is invalid.");
+ return;
+ }
}
boolean admin = Boolean.parseBoolean(getParam(req, "permissions[admin]"));