diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java
index 5b33e5ac..49c669b2 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/interceptor/MagicWebRequestInterceptor.java
@@ -33,7 +33,7 @@ public abstract class MagicWebRequestInterceptor {
 				Valid valid = handlerMethod.getMethodAnnotation(Valid.class);
 				boolean requiredLogin = authorizationInterceptor.requireLogin();
 				boolean validRequiredLogin = (valid == null || valid.requireLogin());
-				if ((validRequiredLogin && requiredLogin) || !(authorizationInterceptor instanceof DefaultAuthorizationInterceptor)) {
+				if (validRequiredLogin && requiredLogin) {
 					request.setAttribute(Constants.ATTRIBUTE_MAGIC_USER, authorizationInterceptor.getUserByToken(request.getHeader(Constants.MAGIC_TOKEN_HEADER)));
 				}
 				((MagicController) handler).doValid(request, valid);
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
index 6542d2ad..cd23255e 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/web/MagicResourceController.java
@@ -14,10 +14,7 @@ import org.ssssssss.magicapi.core.servlet.MagicHttpServletRequest;
 import org.ssssssss.magicapi.utils.IoUtils;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 
 public class MagicResourceController extends MagicController implements MagicExceptionHandler {
@@ -180,6 +177,7 @@ public class MagicResourceController extends MagicController implements MagicExc
 					.stream()
 					.filter(it -> allowVisit(request, Authorization.VIEW, it))
 					.map(MagicEntity::simple)
+					.sorted(Comparator.comparing(MagicEntity::getName))
 					.map((Function<MagicEntity, TreeNode>) TreeNode::new)
 					.forEach(value::addChild);
 		}