diff --git a/spring-5-security/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java b/spring-5-security/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java
index 56f7cea3b8..cb174cad28 100644
--- a/spring-5-security/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java
+++ b/spring-5-security/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java
@@ -32,19 +32,22 @@ public class ClientErrorLoggingFilter extends GenericFilterBean {
         Authentication auth = SecurityContextHolder.getContext()
             .getAuthentication();
 
-        if (auth != null) {
-            int status = ((HttpServletResponse) response).getStatus();
-            if (status >= 400 && status < 500) {
-                if (errorCodes == null) {
-                    logger.debug("User " + auth.getName() + " encountered error " + status);
-                } else {
-                    if (errorCodes.stream()
-                        .filter(s -> s.value() == status)
-                        .findFirst()
-                        .isPresent()) {
-                        logger.debug("User " + auth.getName() + " encountered error " + status);
-                    }
-                }
+        if (auth == null) {
+            chain.doFilter(request, response);
+            return;
+        }
+        int status = ((HttpServletResponse) response).getStatus();
+        if (status < 400 || status >= 500) {
+            chain.doFilter(request, response);
+            return;
+        }
+
+        if (errorCodes == null) {
+            logger.debug("User " + auth.getName() + " encountered error " + status);
+        } else {
+            if (errorCodes.stream()
+                .anyMatch(s -> s.value() == status)) {
+                logger.debug("User " + auth.getName() + " encountered error " + status);
             }
         }
 
diff --git a/spring-5-security/src/main/resources/application.properties b/spring-5-security/src/main/resources/application.properties
index 781ee76826..5912b0f755 100644
--- a/spring-5-security/src/main/resources/application.properties
+++ b/spring-5-security/src/main/resources/application.properties
@@ -2,4 +2,4 @@ server.port=8081
 
 logging.level.root=INFO
 
-logging.level.com.baeldung.dsl.ClientErrorLoggingFilter=DEBUG
+logging.level.com.baeldung.dsl.ClientErrorLoggingFilter=DEBUG
\ No newline at end of file