diff --git a/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/Security/ApiKeyAuthenticationFilter.java b/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/Security/ApiKeyAuthenticationFilter.java
index ca52d54..e675bea 100644
--- a/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/Security/ApiKeyAuthenticationFilter.java
+++ b/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/Security/ApiKeyAuthenticationFilter.java
@@ -4,13 +4,12 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import xyz.thewhitedog9487.WebAPI.Controller.ResponseData;
 import xyz.thewhitedog9487.WebAPI.Data.Entity.AccessLog;
@@ -24,29 +23,11 @@ import java.util.Locale;
 import java.util.Map;
 
 @Slf4j
-@Component
+@AllArgsConstructor
 public class ApiKeyAuthenticationFilter extends OncePerRequestFilter {
 
-    @Autowired List<String> ApiKeyList;
-    @Autowired AccessLogRepository AccessLogRepository;
-
-    @Override
-    protected boolean shouldNotFilter(HttpServletRequest request) {
-        var ServletPath = request.getServletPath();
-        var PermitPrefix = List.of(
-                "/ip/",
-                "/v3/api-docs",
-                "/swagger-ui/" );
-        var FullyMatchList = List.of(
-                "/",
-                "/swagger-ui.html" );
-        for (String Prefix : PermitPrefix) {
-            if ( ServletPath.startsWith(Prefix) ) {
-                return true; } }
-        for (String FullyMatch : FullyMatchList) {
-            if ( ServletPath.equals(FullyMatch) ) {
-                return true; } }
-        return false; }
+    List<String> ApiKeyList;
+    AccessLogRepository AccessLogRepository;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
diff --git a/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/SpringSecurityConfiguration.java b/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/SpringSecurityConfiguration.java
index 649bf91..220226c 100644
--- a/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/SpringSecurityConfiguration.java
+++ b/src/main/java/xyz/thewhitedog9487/WebAPI/Configuration/SpringSecurityConfiguration.java
@@ -1,36 +1,51 @@
 package xyz.thewhitedog9487.WebAPI.Configuration;
 
+import jakarta.servlet.FilterChain;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import xyz.thewhitedog9487.WebAPI.Configuration.Security.ApiKeyAuthenticationFilter;
+import xyz.thewhitedog9487.WebAPI.Data.Repository.AccessLogRepository;
+
+import java.util.List;
 
 @Configuration
 class SpringSecurityConfiguration {
-    @Autowired ApiKeyAuthenticationFilter ApiKeyAuthenticationFilter;
+
+    @Autowired List<String> ApiKeyList;
+    @Autowired AccessLogRepository AccessLogRepository;
 
     /**
-     * @see ApiKeyAuthenticationFilter#shouldNotFilter(HttpServletRequest) 
+     * @see ApiKeyAuthenticationFilter#doFilterInternal(HttpServletRequest, HttpServletResponse, FilterChain)
      */
+    @Order(1)
     @Bean
-    SecurityFilterChain CustomSecurityFilterChain(HttpSecurity Security) throws Exception {
+    SecurityFilterChain RequireAPIKey(HttpSecurity Security) throws Exception {
+        Security
+                .securityMatcher("/message/**", "/accesslog/**")
+                .csrf(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(AuthorizationManagerRequestMatcherRegistry -> {
+                    AuthorizationManagerRequestMatcherRegistry
+                            .anyRequest()
+                            .authenticated(); })
+                .addFilterBefore(new ApiKeyAuthenticationFilter(ApiKeyList, AccessLogRepository), UsernamePasswordAuthenticationFilter.class);
+        return Security.build(); }
+
+    @Order(2)
+    @Bean
+    SecurityFilterChain PermitAll(HttpSecurity Security) throws Exception {
         Security
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(AuthorizationManagerRequestMatcherRegistry -> {
                     AuthorizationManagerRequestMatcherRegistry
-                            .requestMatchers("/ip/**")
-                            .permitAll()
-                            .requestMatchers("/", "/v3/api-docs/**","swagger-ui/**",  "/swagger-ui.html")
-                            .permitAll()
-                            .requestMatchers("/message/**", "/accesslog/**")
-                            .authenticated()
                             .anyRequest()
-                            .denyAll(); })
-                .addFilterBefore(ApiKeyAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+                            .permitAll(); });
         return Security.build(); }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/xyz/thewhitedog9487/WebAPI/GlobalSharedBean.java b/src/main/java/xyz/thewhitedog9487/WebAPI/GlobalSharedBean.java
index d1eec4d..f420964 100644
--- a/src/main/java/xyz/thewhitedog9487/WebAPI/GlobalSharedBean.java
+++ b/src/main/java/xyz/thewhitedog9487/WebAPI/GlobalSharedBean.java
@@ -49,10 +49,6 @@ class GlobalSharedBean {
                 System.exit(-1); }
             return null; } }
 
-    @Bean
-    ApiKeyAuthenticationFilter ApiKeyAuthenticationFilter(){
-        return new ApiKeyAuthenticationFilter(); }
-
     @Bean
     Lock SQLiteWriteLock(){
         return new ReentrantLock(); }