1 files changed, 9 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 9f1b6b3e8..1cc2a5711 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -41,7 +41,6 @@ import at.gv.egovernment.moa.id.auth.exception.ProtocolNotActiveException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
-import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
@@ -271,10 +270,17 @@ public class DispatcherServlet extends AuthServlet{
 							
 						//request is a new authentication request	
 						} else if (protocolRequest != null &&
-								MiscUtil.isEmpty(protocolRequest.getRequestID())) {								
+								MiscUtil.isEmpty(protocolRequest.getRequestID())) {															
 							//Start new Authentication
-							protocolRequest.setAction(action);
 							protocolRequest.setModule(module);
+							
+							//if preProcessing has not set a specific action from decoded request 
+							//   then set the default action
+							if (MiscUtil.isEmpty(protocolRequest.requestedAction()))
+									protocolRequest.setAction(action);
+							else
+								moduleAction = info.getAction(protocolRequest.requestedAction());
+							
 							protocolRequestID = Random.nextRandom();
 							protocolRequest.setRequestID(protocolRequestID);							
 							RequestStorage.setPendingRequest(protocolRequest);