diff --git a/applications/accounting/webapp/accounting/WEB-INF/web.xml b/applications/accounting/webapp/accounting/WEB-INF/web.xml
index 3b1a6d498d..33db2d1749 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/web.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/web.xml
@@ -69,7 +69,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/content/webapp/content/WEB-INF/web.xml b/applications/content/webapp/content/WEB-INF/web.xml
index 3f2384e1d7..72e818eb16 100644
--- a/applications/content/webapp/content/WEB-INF/web.xml
+++ b/applications/content/webapp/content/WEB-INF/web.xml
@@ -74,7 +74,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml b/applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml
index b1d667b2fb..4263f44b0a 100644
--- a/applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml
+++ b/applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml
@@ -81,7 +81,7 @@ under the License.
org.ofbiz.order.shoppingcart.CartEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
ControlServlet
diff --git a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
index 5f1e69da82..50e71c808f 100644
--- a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
+++ b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
@@ -65,7 +65,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/marketing/webapp/marketing/WEB-INF/web.xml b/applications/marketing/webapp/marketing/WEB-INF/web.xml
index 385a61b467..9b1476fc49 100644
--- a/applications/marketing/webapp/marketing/WEB-INF/web.xml
+++ b/applications/marketing/webapp/marketing/WEB-INF/web.xml
@@ -75,7 +75,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/order/webapp/ordermgr/WEB-INF/web.xml b/applications/order/webapp/ordermgr/WEB-INF/web.xml
index f38cb523e8..7f2c68e192 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/web.xml
+++ b/applications/order/webapp/ordermgr/WEB-INF/web.xml
@@ -76,7 +76,7 @@
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/party/webapp/partymgr/WEB-INF/web.xml b/applications/party/webapp/partymgr/WEB-INF/web.xml
index 9fd635b987..93c4083bec 100644
--- a/applications/party/webapp/partymgr/WEB-INF/web.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/web.xml
@@ -75,7 +75,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/product/webapp/catalog/WEB-INF/web.xml b/applications/product/webapp/catalog/WEB-INF/web.xml
index 72a5f1afa2..4263b47965 100644
--- a/applications/product/webapp/catalog/WEB-INF/web.xml
+++ b/applications/product/webapp/catalog/WEB-INF/web.xml
@@ -70,7 +70,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/product/webapp/facility/WEB-INF/web.xml b/applications/product/webapp/facility/WEB-INF/web.xml
index e26bb917c5..6668f0f5d5 100644
--- a/applications/product/webapp/facility/WEB-INF/web.xml
+++ b/applications/product/webapp/facility/WEB-INF/web.xml
@@ -65,7 +65,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
index 566654c551..ea5ed7c6f0 100644
--- a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
@@ -75,7 +75,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/framework/example/webapp/example/WEB-INF/web.xml b/framework/example/webapp/example/WEB-INF/web.xml
index 0e777d9c39..2d3bcdabc9 100644
--- a/framework/example/webapp/example/WEB-INF/web.xml
+++ b/framework/example/webapp/example/WEB-INF/web.xml
@@ -60,7 +60,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/framework/shark/webapp/shark/WEB-INF/web.xml b/framework/shark/webapp/shark/WEB-INF/web.xml
index 0baa1494d7..92a148dfb5 100644
--- a/framework/shark/webapp/shark/WEB-INF/web.xml
+++ b/framework/shark/webapp/shark/WEB-INF/web.xml
@@ -63,7 +63,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener
diff --git a/framework/webtools/webapp/webtools/WEB-INF/web.xml b/framework/webtools/webapp/webtools/WEB-INF/web.xml
index 574a95a2f7..f8f489d4dd 100644
--- a/framework/webtools/webapp/webtools/WEB-INF/web.xml
+++ b/framework/webtools/webapp/webtools/WEB-INF/web.xml
@@ -77,7 +77,7 @@ under the License.
org.ofbiz.webapp.control.ControlEventListener
- org.ofbiz.securityext.login.LoginEventListener
+ org.ofbiz.webapp.control.LoginEventListener