diff --git a/GAE/src/org/akvo/flow/rest/security/EntryPoint.java b/GAE/src/org/akvo/flow/rest/security/EntryPoint.java
deleted file mode 100644
index 21647738a2..0000000000
--- a/GAE/src/org/akvo/flow/rest/security/EntryPoint.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2019 Stichting Akvo (Akvo Foundation)
- *
- * This file is part of Akvo FLOW.
- *
- * Akvo FLOW is free software: you can redistribute it and modify it under the terms of
- * the GNU Affero General Public License (AGPL) as published by the Free Software Foundation,
- * either version 3 of the License or any later version.
- *
- * Akvo FLOW is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Affero General Public License included below for more details.
- *
- * The full license text can also be seen at <http://www.gnu.org/licenses/agpl.html>.
- */
-
-package org.akvo.flow.rest.security;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-
-import com.google.appengine.api.utils.SystemProperty;
-
-public class EntryPoint implements AuthenticationEntryPoint {
-    private final AuthenticationEntryPoint devEntryPoint;
-    private final AuthenticationEntryPoint prodEntryPoint;
-
-
-    public EntryPoint(AuthenticationEntryPoint prodEntryPoint, AuthenticationEntryPoint devEntryPoint) {
-        this.devEntryPoint = devEntryPoint;
-        this.prodEntryPoint = prodEntryPoint;
-    }
-
-    @Override
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
-        if (SystemProperty.environment.value() == SystemProperty.Environment.Value.Production) {
-            prodEntryPoint.commence(request, response, authException);
-        } else {
-            devEntryPoint.commence(request, response, authException);
-        }
-    }
-}
diff --git a/GAE/war/WEB-INF/webapp-security.xml b/GAE/war/WEB-INF/webapp-security.xml
index 7a3bd8ff68..1c63ea546a 100644
--- a/GAE/war/WEB-INF/webapp-security.xml
+++ b/GAE/war/WEB-INF/webapp-security.xml
@@ -24,8 +24,8 @@
       <b:constructor-arg ref="oidcConfig"/>
    </b:bean>
 
-    <http use-expressions="true" entry-point-ref="defaultEntryPoint" authentication-manager-ref="authenticationManager"
-        access-decision-manager-ref="accessDecisionManager">
+   <http use-expressions="true" entry-point-ref="#{systemProperties['authEntryPoint'] ?: 'oidcEntryPoint'}"
+          authentication-manager-ref="authenticationManager" access-decision-manager-ref="accessDecisionManager">
         <headers>
             <frame-options policy="SAMEORIGIN" />
         </headers>
@@ -87,9 +87,4 @@
 
     <b:bean id="gaeAuthenticationProvider" class="org.akvo.flow.rest.security.google.GoogleAccountsAuthenticationProvider" />
 
-    <b:bean id="defaultEntryPoint" class="org.akvo.flow.rest.security.EntryPoint">
-        <b:constructor-arg ref="oidcEntryPoint"/> <!-- production -->
-        <b:constructor-arg ref="gaeEntryPoint"/> <!-- development -->
-    </b:bean>
-
 </b:beans>
diff --git a/tests/dev-appengine-web.xml b/tests/dev-appengine-web.xml
index d5d578593f..7b56cc0c17 100644
--- a/tests/dev-appengine-web.xml
+++ b/tests/dev-appengine-web.xml
@@ -58,5 +58,6 @@
         <property name="serviceAccountId" value="sa-akvoflowsandbox@akvoflowsandbox.iam.gserviceaccount.com"/>
         <property name="hereMapsAppId" value="none"/>
         <property name="hereMapsAppCode" value="neither"/>
+        <property name="authEntryPoint" value="gaeEntryPoint"/>
     </system-properties>
 </appengine-web-app>