diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java
new file mode 100644
index 0000000000..5df32d6392
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java
@@ -0,0 +1,15 @@
+package com.baeldung.app.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class PasswordEncoderConfig {
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
index 15af160135..c0abd3cec1 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
@@ -22,15 +22,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     }
 
     @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+    public void configureGlobal(AuthenticationManagerBuilder auth, PasswordEncoder passwordEncoder) throws Exception {
         auth.inMemoryAuthentication()
-            .withUser("jim").password(passwordEncoder().encode("jim")).roles("USER", "ACTUATOR")
-            .and().withUser("pam").password(passwordEncoder().encode("pam")).roles("USER")
-            .and().withUser("michael").password(passwordEncoder().encode("michael")).roles("MANAGER");
-    }
-    
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
+            .withUser("jim").password(passwordEncoder.encode("jim")).roles("USER", "ACTUATOR")
+            .and().withUser("pam").password(passwordEncoder.encode("pam")).roles("USER")
+            .and().withUser("michael").password(passwordEncoder.encode("michael")).roles("MANAGER");
     }
+
 }