diff --git a/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java b/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
index 804514b28e..3d0d0a86b7 100644
--- a/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
+++ b/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
@@ -167,7 +167,7 @@ public class HttpSecurityConfigPostProcessor implements BeanFactoryPostProcessor
         if (entryPoints.size() == 1) {
             mainEntryPoint = (AuthenticationEntryPoint) entryPoints.get(0);
         } else {
-            mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.MAIN_ENTRY_POINT);
+            mainEntryPoint = (AuthenticationEntryPoint) beanFactory.getBean(BeanIds.MAIN_ENTRY_POINT);
             
             if (mainEntryPoint == null) {
             	mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.FORM_LOGIN_ENTRY_POINT);