merge SSO interfederation into Snapshot branch

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java

19 files changed, 964 insertions, 638 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 20a5ad1ea..a3541c9a7 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -34,352 +34,16 @@
 								
 				<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
 				
-				
-					<div class="oa_config_block">
-					
-						<s:if test="authUser.isAdmin()">
-							<s:checkbox name="generalOA.Active" 
-								value="%{generalOA.Active}"
-								labelposition="left"
-								key="webpages.oaconfig.general.isActive"
-								cssClass="checkbox">
-							</s:checkbox>
-						</s:if>
+					<s:include value="snippets/OA/generalInformation.jsp"></s:include>			
+		
+					<s:include value="snippets/OA/targetConfiguration.jsp"></s:include>
+		
+					<s:include value="snippets/OA/authentication.jsp"></s:include>
 					
-						<s:textfield name="generalOA.identifier" 
-							value="%{generalOA.identifier}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.identification"
-							cssClass="textfield_long">
-						</s:textfield>
-									
- 						<s:textfield name="generalOA.friendlyName" 
-							value="%{generalOA.friendlyName}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.friendlyname"
-							cssClass="textfield_long">
-						</s:textfield>
-
-                        <s:checkbox name="generalOA.businessService"
-                                    value="%{generalOA.businessService}"
-                                    labelposition="left"
-                                    key="webpages.oaconfig.general.isbusinessservice"
-                                    cssClass="checkbox"
-                                    onclick="oaBusinessService();"
-                                    id="OAisbusinessservice"
-                                    >
-                        </s:checkbox>
-
-
-					</div>
+					<s:include value="snippets/OA/sso.jsp"></s:include>
 					
- 					<div id="oa_config_businessservice" class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
-						
-						<s:select list="generalOA.identificationTypeList"
-											key="webpages.oaconfig.general.business.value"
-											labelposition="left"
-											cssClass="selectfield"
-											value="%{generalOA.identificationType}"
-											name="generalOA.identificationType"
-											disabled="%{isDeaktivededBusinessService()}">
-						</s:select>
-						
-						<s:textfield name="generalOA.identificationNumber" 
-							value="%{generalOA.identificationNumber}" 
-							cssClass="textfield_middle"
-							disabled="%{isDeaktivededBusinessService()}">
-						</s:textfield>		
-					</div>
-					
-					<s:if test="!isOnlyBusinessService()">
-						<div id="oa_config_publicservice" class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
-							
-							<s:if test="authUser.isAdmin()">
-								<s:select list="generalOA.targetList"
-													key="webpages.oaconfig.general.target"
-													labelposition="left"
-													cssClass="selectfield"
-													value="%{generalOA.target}"
-													name="generalOA.target"
-													onchange="HideAdminTarget();">
-								</s:select>						
-							</s:if>
-							<s:else>
-								<s:select list="generalOA.targetList"
-													key="webpages.oaconfig.general.target"
-													labelposition="left"
-													cssClass="selectfield"
-													value="%{generalOA.target}"
-													name="generalOA.target">
-								</s:select>
-							</s:else>
+					<s:include value="snippets/OA/stork.jsp"></s:include>
 							
-							<s:checkbox name="subTargetSet" 
-								value="%{subTargetSet}"
-								labelposition="left"
-								key="webpages.oaconfig.general.target.subsector.checkbox"
-								cssClass="checkbox"
-								onclick="oaTargetSubSector();"
-								id="OAisTargetSubSector">
-							</s:checkbox>
-							
-							<s:textfield name="generalOA.target_subsector" 
-								value="%{generalOA.target_subsector}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.target.subsector"
-								cssClass="selectfield"
-								id="OAtarget_subsector">
-							</s:textfield>
-							
-							
-	 						<s:if test="authUser.isAdmin()">
-	 							<s:checkbox
-		 							name="generalOA.AdminTarget" 
-									value="%{generalOA.AdminTarget}"
-									cssClass="checkbox"
-	 								onclick="AdminTarget();"
-	 								labelposition="left"
-									key="webpages.oaconfig.general.target.admin.checkbox"
-									id="adminTarget">
-	 							</s:checkbox>
-	 							
-	 							<div id="admin_target_area">
-									<s:textfield name="generalOA.target_admin" 
-										value="%{generalOA.target_admin}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.admin"
-										cssClass="textfield_short">
-									</s:textfield>
-									<s:textfield name="generalOA.targetFriendlyName" 
-										value="%{generalOA.targetFriendlyName}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.friendlyname"
-										cssClass="textfield_long">
-									</s:textfield>
-								</div>
-	 						</s:if>
-	 						<s:else>
-	 							<s:if test="generalOA.target_admin neq null">
-	 								<s:textfield name="generalOA.target_admin" 
-										value="%{generalOA.target_admin}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.admin.disabled"
-										cssClass="textfield_short"
-										disabled="true">
-									</s:textfield>
-								</s:if>
-	<%-- 							<s:if test="generalOA.targetFriendlyName neq null">
-									<s:textfield name="generalOA.targetFriendlyName" 
-										value="%{generalOA.targetFriendlyName}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.target.friendlyname.disabled"
-										cssClass="textfield_long">
-									</s:textfield>
-								</s:if> --%>
-	 						</s:else>
-						</div>
-					</s:if>
-					
-					<s:if test="authUser.isAdmin()">
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
-							
-							<s:textfield name="generalOA.bkuOnlineURL" 
-								value="%{generalOA.bkuOnlineURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.online"
-								cssClass="textfield_long">
-							</s:textfield>
-	
-							<s:textfield name="generalOA.bkuHandyURL" 
-								value="%{generalOA.bkuHandyURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.handy"
-								cssClass="textfield_long">
-							</s:textfield>
-	
-							<s:textfield name="generalOA.bkuLocalURL" 
-								value="%{generalOA.bkuLocalURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.local"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-							<s:radio list="generalOA.keyBoxIdentifierList"
-								name="generalOA.keyBoxIdentifier"
-								value="%{generalOA.keyBoxIdentifier}"
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.keyboxidentifier"
-								cssClass="radio">
-							</s:radio>						
-							<s:checkbox name="generalOA.legacy" 
-								value="%{generalOA.legacy}"
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.legacy"
-								cssClass="checkbox"
-								onclick="oaLegacyService();"
-								id="OAislegacy">
-							</s:checkbox>
-							<div id="oa_config_sltemplates">
-								<s:textfield name="generalOA.SLTemplateURL1" 
-									value="%{generalOA.SLTemplateURL1}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.bku.sltemplate.first"
-									cssClass="textfield_long">
-								</s:textfield>
-								<s:textfield name="generalOA.SLTemplateURL2" 
-									value="%{generalOA.SLTemplateURL2}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.bku.sltemplate.second"
-									cssClass="textfield_long">
-								</s:textfield>
-								<s:textfield name="generalOA.SLTemplateURL3" 
-									value="%{generalOA.SLTemplateURL3}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.bku.sltemplate.third"
-									cssClass="textfield_long">
-								</s:textfield>
-							</div>
-							
-							<div class="oa_protocol_area">
-								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
-								<s:iterator value="%{generalOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
-									<div class="floatClass">
-										<s:label key="webpages.oaconfig.general.bku.bkuselection.filename" value="%{fileNameBKU}"/>
-										<s:checkbox key="webpages.oaconfig.general.bku.delete"
-																labelposition="left"														
-																cssClass="checkbox"
-																name="generalOA.deleteBKUTemplate"></s:checkbox>
-									</div>
-									<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
-									</div>
-								</s:iterator>
-								<s:if test="generalOA.bkuSelectionFileUploadFileName.size() == 0">
-										<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
-									</div>
-								</s:if>
-							</div>
-							<div class="oa_protocol_area">
-								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.sendassertion.header", request) %></h4>
-								<s:iterator value="%{generalOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
-									<div class="floatClass">
-										<s:label 	key="webpages.oaconfig.general.bku.sendassertion.filename" 
-															value="%{fileNameBKU}"/>
-										<s:checkbox key="webpages.oaconfig.general.bku.delete"
-																labelposition="left"														
-																cssClass="checkbox"
-																name="generalOA.deleteSendAssertionTemplate"></s:checkbox>
-									</div>
-									<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
-									</div>
-								</s:iterator>
-								<s:if test="generalOA.sendAssertionFileUploadFileName.size() == 0">
-										<div id="pvp2_certificate_upload">
-										<s:file name="generalOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
-									</div>
-								</s:if>
-							</div>
-							
-						</div>
-					</s:if>
-					
-					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.mandate.header", request) %></h3>
-						
-						
-						<s:checkbox name="generalOA.useMandates" 
-												value="%{generalOA.useMandates}"
-												labelposition="left"
-												key="webpages.oaconfig.general.mandate.usemandate"
-												cssClass="checkbox">
-						</s:checkbox>	
-						
-						<s:textfield name="generalOA.mandateProfiles" 
-							value="%{generalOA.mandateProfiles}" 
-							labelposition="left"
-							key="webpages.oaconfig.general.mandate.profiles"
-							cssClass="textfield_long">
-						</s:textfield>
-						
-						<s:checkbox name="formOA.onlyMandateAllowed" 
-									value="%{formOA.onlyMandateAllowed}"
-									labelposition="left"
-									key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
-									cssClass="checkbox">
-						</s:checkbox>
-						
-					</div>
-
-					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></h3>
-						
-						<s:checkbox name="ssoOA.useSSO" 
-							value="%{ssoOA.useSSO}"
-							labelposition="left"
-							key="webpages.oaconfig.sso.usesso"
-							cssClass="checkbox"
-							onclick="oaSSOService();"
-							id="OAuseSSO">
-						</s:checkbox>
-						
-						<div id="sso_bock">
-							<s:if test="authUser.isAdmin()">
-								<s:checkbox name="ssoOA.showAuthDataFrame" 
-									value="%{ssoOA.showAuthDataFrame}"
-									labelposition="left"
-									key="webpages.oaconfig.sso.useauthdataframe"
-									cssClass="checkbox"
-									onclick="oaBusinessService();">
-								</s:checkbox>
-							</s:if>
-					
-<%--TODO: insert if SLO is implemented!!!--%> 
-<%--							<s:textfield name="ssoOA.singleLogOutURL" 
-								value="%{ssoOA.singleLogOutURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.sso.singlelogouturl"
-								cssClass="textfield_long">
-							</s:textfield> --%>
-						</div>
-					</div>
-
-					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
-
-						<s:checkbox name="storkOA.storkLogonEnabled" 
-							value="%{storkOA.storkLogonEnabled}"
-							labelposition="left"
-							key="webpages.oaconfig.stork.usestork"
-							cssClass="checkbox"
-							onclick="oaStork();"
-							id="OAuseSTORKLogon" />
-						<div id="stork_block">
-							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
-								value="#{storkOA.qaa}"
-								name="storkOA.qaa"
-								key="webpages.moaconfig.stork.qaa"
-								labelposition="left" />
-							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.enabledcpeps", request) %></h4>
-							<s:checkboxlist name="storkOA.enabledCitizenCountries" list="storkOA.availableCitizenCountries" value="storkOA.enabledCitizenCountries" />
-							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.header", request) %></h4>
-							<table>
-								<tr><th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.used", request) %></th>
-								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.name", request) %></th>
-								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.mandatory", request) %></th></tr>
-								<s:iterator value="storkOA.helperAttributes" status="stat">
-									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /></td>
-										<td><s:property value="%{name}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
-										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td></tr>
-								</s:iterator>
-							</table>
-						</div>
-					</div>
-
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3>
 						
@@ -390,13 +54,6 @@
 								<button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden">
 									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %>
 								</button>
-								
-								<button  type="button" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_show">
-									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.show", request) %>
-								</button>
-								<button type="button" style="display:none" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_hidden">
-									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.hidden", request) %>
-								</button>
 							</s:if>
 							
 							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
@@ -412,297 +69,19 @@
 							<button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden">
 								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
 						  </button>
-						  						
-						<div id="oa_saml1_area" class="oa_protocol_area hidden">
-							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.saml1.header", request) %></h4>
-							
-							<s:if test="authUser.isAdmin()">
-								<s:checkbox name="saml1OA.Active" 
-									value="%{saml1OA.Active}"
-									labelposition="left"
-									key="webpages.oaconfig.saml1.isActice"
-									cssClass="checkbox">
-								</s:checkbox>
-							</s:if>
-							<s:checkbox name="saml1OA.provideStammZahl" 
-								value="%{saml1OA.provideStammZahl}"
-								labelposition="left"
-								key="webpages.oaconfig.saml1.provideStammZahl"
-								cssClass="checkbox">
-							</s:checkbox>
-							<s:checkbox name="saml1OA.provideAuthBlock" 
-								value="%{saml1OA.provideAuthBlock}"
-								labelposition="left"
-								key="webpages.oaconfig.saml1.provideAuthBlock"
-								cssClass="checkbox">
-							</s:checkbox>
-							<br>
-							<s:checkbox name="saml1OA.provideIdentityLink" 
-								value="%{saml1OA.provideIdentityLink}"
-								labelposition="left"
-								key="webpages.oaconfig.saml1.provideIdentityLink"
-								cssClass="checkbox">
-							</s:checkbox>							
-							<s:checkbox name="saml1OA.provideCertificate" 
-								value="%{saml1OA.provideCertificate}"
-								labelposition="left"
-								key="webpages.oaconfig.saml1.provideCertificate"
-								cssClass="checkbox">
-							</s:checkbox>
-							<s:checkbox name="saml1OA.provideFullMandateData" 
-								value="%{saml1OA.provideFullMandateData}"
-								labelposition="left"
-								key="webpages.oaconfig.saml1.provideFullMandateData"
-								cssClass="checkbox">
-							</s:checkbox>
-<%-- 							<br>
-							<br>
-							<br>
-							<s:checkbox name="saml1OA.useCondition" 
-								value="%{saml1OA.useCondition}"
-								labelposition="left"
-								key="webpages.oaconfig.saml1.useCondition"
-								cssClass="checkbox">
-							</s:checkbox>
-							<s:textfield name="saml1OA.conditionLength" 
-								value="%{saml1OA.conditionLength}" 
-								labelposition="left"
-								key="webpages.oaconfig.saml1.conditionLength"
-								cssClass="textfield_short">
-							</s:textfield> --%>
-							
-						</div>
-						
-						<div id="oa_pvp2_area" class="oa_protocol_area hidden">
-							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4>
-						
-							<s:checkbox 	key="webpages.oaconfig.pvp2.reload"
-														labelposition="left"														
-														cssClass="checkbox"
-														name="pvp2OA.reLoad"></s:checkbox>
-						
-						  <s:textfield name="pvp2OA.metaDataURL" 
-								value="%{pvp2OA.metaDataURL}" 
-								labelposition="left"
-								key="webpages.oaconfig.pvp2.metaDataURL"
-								cssClass="textfield_long">
-							</s:textfield>
-						
-							<s:label key="webpages.oaconfig.pvp2.certifcate.info" value="%{pvp2OA.certificateDN}"/>
-							
-							<div id="pvp2_certificate_upload">
-								<s:file name="pvp2OA.fileUpload" key="webpages.oaconfig.pvp2.certifcate" cssClass="textfield_long"></s:file>
-							</div>
-						</div>
-						
-						<div id="oa_oauth20_area" class="oa_protocol_area hidden">
-							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.oauth20.header", request) %></h4>
-						
-							<s:label key="webpages.oaconfig.oauth20.clientId" value="%{oauth20OA.clientId}"/>
-							
-							<s:label key="webpages.oaconfig.oauth20.clientSecret" value="%{oauth20OA.clientSecret}"/>
-														
-							<s:textfield name="oauth20OA.redirectUri" 
-								value="%{oauth20OA.redirectUri}" 
-								labelposition="left"
-								key="webpages.oaconfig.oauth20.redirectUri"
-								cssClass="textfield_long">
-							</s:textfield>
-						</div>
-						
-											
-						<div id="oa_vidp_area" class="oa_protocol_area">
-							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
-	
-							<p><s:checkbox name="storkOA.vidpEnabled" 
-								value="%{storkOA.vidpEnabled}"
-								labelposition="left"
-								key="webpages.oaconfig.vidp.enabled"
-								cssClass="checkbox"
-								id="OAuseVidp" /></p>
-								
-							<p><s:checkbox name="storkOA.requireConsent"
-								value="%{storkOA.requireConsent}"
-								labelposition="left"
-								key="webpages.oaconfig.vidp.requireconsent"
-								cssClass="checkbox"
-								id="OArequireConsent" /></p>
-							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
-							<table id="stork_aplist">
-								<tr><th>AP Plugin</th><th>URL</th><th>Attribute (CSV)</th></tr>
-								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
-								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].name" value="%{name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
-								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield_mail"/></td>
-								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].attributes" value="%{attributes}" cssClass="textfield_mail"/></td>
-								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
-								</s:iterator>
-							</table>
-							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.new", request) %>" onclick='newAp();' />
-								
-						</div>
-					</div>
 
 
-					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.aditional.header", request) %></h3>
-												
-<%-- 				<s:checkbox name="generalOA.calculateHPI" 
-							value="%{generalOA.calculateHPI}"
-							labelposition="left"
-							key="webpages.oaconfig.general.aditional.calculateHPI"
-							cssClass="textfield_long">
-						</s:checkbox> --%>
-						
-						<s:checkbox name="generalOA.HideBPKAuthBlock" 
-							value="%{generalOA.HideBPKAuthBlock}"
-							labelposition="left"
-							key="webpages.oaconfig.general.isHideBPKAuthBlock"
-							cssClass="checkbox">
-						</s:checkbox>
+							<s:include value="snippets/OA/saml1.jsp"></s:include>
+
+							<s:include value="snippets/OA/pvp2.jsp">
+								<s:param name="hideBlock">hidden</s:param>
+							</s:include>							
 						
-						<s:if test="authUser.isAdmin()">						
-							<s:textarea name="generalOA.aditionalAuthBlockText" 
-								value="%{generalOA.aditionalAuthBlockText}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.aditional.authblocktext"
-								cssClass="textfield_large">
-							</s:textarea>
-							
-							
-							<button type="button" class="oa_buttons" onclick="oaFormCustom();" id="formcustom_button_show">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.show", request) %>
-						  </button>
-							<button type="button" class="oa_buttons" onclick="oaFormCustom();" id="formcustom_button_hidden">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.hidden", request) %>
-						  </button>
-						  						
-							<div id="formcustom_area" class="oa_protocol_area hidden">
-								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
-																
-								<div id="formCustomValues">													
-									<s:textfield name="formOA.backGroundColor" 
-										value="%{formOA.backGroundColor}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("MAIN_BACKGOUNDCOLOR")'
-										id="MAIN_BACKGOUNDCOLOR">
-									</s:textfield>								
-									<s:textfield name="formOA.frontColor" 
-										value="%{formOA.frontColor}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.frontcolor"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("MAIN_COLOR")'
-										id="MAIN_COLOR">
-									</s:textfield>
-									
-									<s:textfield name="formOA.header_BackGroundColor" 
-										value="%{formOA.header_BackGroundColor}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.backgroundcolor"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("HEADER_BACKGROUNDCOLOR")'
-										id="HEADER_BACKGROUNDCOLOR">
-									</s:textfield>
-									<s:textfield name="formOA.header_FrontColor" 
-										value="%{formOA.header_FrontColor}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.frontcolor"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("HEADER_COLOR")'
-										id="HEADER_COLOR">
-									</s:textfield>
-									<s:textfield name="formOA.header_text" 
-										value="%{formOA.header_text}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.text"
-										cssClass="textfield_middle"
-										onchange='updateBKUFormPreview("HEADER_TEXT")'
-										id="HEADER_TEXT">
-									</s:textfield>
-									
-	<%-- 							<s:textfield name="formOA.button_BackGroundColor" 
-										value="%{formOA.button_BackGroundColor}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.button.background"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("BUTTON_BACKGROUNDCOLOR")'
-										id="BUTTON_BACKGROUNDCOLOR">
-									</s:textfield>
-									<s:textfield name="formOA.button_BackGroundColorFocus" 
-										value="%{formOA.button_BackGroundColorFocus}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.button.background.focus"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("BUTTON_BACKGROUNDCOLOR_FOCUS")'
-										id="BUTTON_BACKGROUNDCOLOR_FOCUS">
-									</s:textfield>
-									<s:textfield name="formOA.button_FrontColor" 
-										value="%{formOA.button_FrontColor}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.button.front"
-										cssClass="textfield_middle colorfield"
-										onchange='updateBKUFormPreview("BUTTON_COLOR")'
-										id="BUTTON_COLOR">
-									</s:textfield> --%>
-									
-									<s:select list="formOA.appletRedirectTargetList"
-														key="webpages.oaconfig.general.BKUSelection.redirectTarget"
-														labelposition="left"
-														cssClass="selectfield"
-														value="%{formOA.appletRedirectTarget}"
-														name="formOA.appletRedirectTarget">
-									</s:select>
-									
-									<s:textfield name="formOA.applet_height" 
-										value="%{formOA.applet_height}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.applet.height"
-										cssClass="textfield_middle"
-										id="HEADER_HEIGHT">
-									</s:textfield>
-									
-									<s:textfield name="formOA.applet_width" 
-										value="%{formOA.applet_width}" 
-										labelposition="left"
-										key="webpages.oaconfig.general.BKUSelection.header.applet.width"
-										cssClass="textfield_middle"
-										id="HEADER_WIDTH">
-									</s:textfield>
-									
-									<s:select list="formOA.fontTypeList"
-														key="webpages.oaconfig.general.BKUSelection.fonttype.list"
-														labelposition="left"
-														cssClass="selectfield"
-														value="%{formOA.fontType}"
-														name="formOA.fontTypeListValue"
-														id="fontTypeList"
-														onchange='$("#FONTTYPE").val($("#fontTypeList").val());updateBKUFormPreview("FONTTYPE");'>
-									</s:select>
-									
-									<s:textfield 	name="formOA.fontType" 
-																value="%{formOA.fontType}" 
-																labelposition="left"
-																key="webpages.oaconfig.general.BKUSelection.fonttype"
-																cssClass="textfield_mail"													
-																onchange='updateBKUFormPreview("FONTTYPE")'
-																id="FONTTYPE">
-									</s:textfield>		
-								</div>
-								
-								<div id="formCustomPreview">
-										<iframe scrolling="none" 
-														title="BKUForm Preview"
-														height="260"
-														width="250">
-										</iframe>
-								</div>
-																
-							</div>
-						</s:if>
+							<s:include value="snippets/OA/openIDConnect.jsp"></s:include>						  						
 							
 					</div>
+
+					<s:include value="snippets/OA/formCustomization.jsp"></s:include>
 					
 					<s:hidden name="formID" 
 							value="%{formID}"></s:hidden>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp
new file mode 100644
index 000000000..3e7404dfc
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/idplist.jsp
@@ -0,0 +1,60 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="../snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="../snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+						
+			<s:if test="authUser.isAdmin()">
+				
+				<div class="oa_config_block">
+					<h3><%=LanguageHelper.getGUIString("webpages.interfederation.list.header", request) %></h3>
+					<s:include value="../snippets/oas_list.jsp">
+						<s:param name="editAction">loadIDP</s:param>
+					</s:include>
+				</div>
+				<br>
+				<br>
+				<div id="button_area">
+					<h3><%=LanguageHelper.getGUIString("webpages.interfederation.new.header", request) %></h3>
+					<s:form action="newIDP" namespace="/secure" method="POST" >
+						<s:hidden name="interfederationType" value="-MOAIDP"></s:hidden>
+						<s:submit key="webpages.interfederation.new.moaid"/>
+					</s:form>		
+					<s:form action="newIDP" namespace="/secure" method="POST" >
+						<s:hidden name="interfederationType" value="-VIDP"></s:hidden>
+						<s:submit key="webpages.interfederation.new.vidp"/>
+					</s:form>		
+				</div>	
+				
+								
+			</s:if>
+				
+		</div>
+		
+		<jsp:include page="../snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp
new file mode 100644
index 000000000..f0d0671bf
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/moa_idp.jsp
@@ -0,0 +1,66 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="../snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="../snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+			
+			<s:if test="authUser.isAdmin()">
+				<div id="list_area"> 
+					<h2><%=LanguageHelper.getGUIString("webpages.interfederation.header", request) %></h2>
+			
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+					
+						<s:include value="../snippets/OA/generalInformation.jsp"></s:include>
+
+						<s:include value="../snippets/OA/interfederation.jsp"></s:include>
+						
+						<s:include value="../snippets/OA/pvp2.jsp">
+							<s:param name="hideBlock">""</s:param>
+						</s:include>	
+										
+						<s:hidden name="formID" value="%{formID}"></s:hidden>
+						<s:hidden name="interfederationType" value="%{interfederationType}"></s:hidden>
+					
+					
+						<div id="button_area">					
+							<s:submit key="webpages.edit.back" action="cancleandbackIDP"/>								
+							<s:submit key="webpages.edit.save" action="saveMOAIDP"/>						
+							<s:if test="!isNewOA()">
+								<s:submit key="webpages.edit.delete" action="deleteIDP"/>
+							</s:if>								
+						</div>					
+			
+					</s:form>
+							
+				</div>
+			</s:if>
+				
+		</div>
+		
+		<jsp:include page="../snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp
new file mode 100644
index 000000000..3a5dd68c9
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/interfederation/vidp.jsp
@@ -0,0 +1,70 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body onload="oaOnLoad()">
+		
+ 		<jsp:include page="../snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="../snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+			
+			<s:if test="authUser.isAdmin()">
+				<div id="list_area"> 
+					<h2><%=LanguageHelper.getGUIString("webpages.interfederation.header", request) %></h2>
+			
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+					
+						<s:include value="../snippets/OA/generalInformation.jsp"></s:include>
+
+						<s:include value="../snippets/OA/targetConfiguration.jsp"></s:include>
+		
+						<s:include value="../snippets/OA/authentication.jsp"></s:include>
+						
+						<s:include value="../snippets/OA/vidp.jsp">
+							<s:param name="hideBlock"></s:param>
+						</s:include>
+						
+						<s:include value="../snippets/OA/formCustomization.jsp"></s:include>
+																
+						<s:hidden name="formID" value="%{formID}"></s:hidden>
+						<s:hidden name="interfederationType" value="%{interfederationType}"></s:hidden>
+					
+					
+						<div id="button_area">					
+							<s:submit key="webpages.edit.back" action="cancleandbackIDP"/>								
+							<s:submit key="webpages.edit.save" action="saveVIDP"/>						
+							<s:if test="!isNewOA()">
+								<s:submit key="webpages.edit.delete" action="deleteIDP"/>
+							</s:if>								
+						</div>					
+			
+					</s:form>
+							
+				</div>
+			</s:if>
+				
+		</div>
+		
+		<jsp:include page="../snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
index 11953ec86..bad50262d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/listOAs.jsp
@@ -27,7 +27,9 @@
    			</div>
 			</s:if>	
 						
-			<jsp:include page="snippets/oas_list.jsp"></jsp:include>
+			<s:include value="snippets/oas_list.jsp">
+				<s:param name="editAction">loadOA</s:param>
+			</s:include>
 			
 		</div>
 		
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
new file mode 100644
index 000000000..a659104ed
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -0,0 +1,97 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+
+					<s:if test="authUser.isAdmin()">
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
+							
+							<s:textfield name="authOA.bkuOnlineURL" 
+								value="%{authOA.bkuOnlineURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.online"
+								cssClass="textfield_long">
+							</s:textfield>
+	
+							<s:textfield name="authOA.bkuHandyURL" 
+								value="%{authOA.bkuHandyURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.handy"
+								cssClass="textfield_long">
+							</s:textfield>
+	
+							<s:textfield name="authOA.bkuLocalURL" 
+								value="%{authOA.bkuLocalURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.local"
+								cssClass="textfield_long">
+							</s:textfield>
+							
+							<s:radio list="authOA.keyBoxIdentifierList"
+								name="authOA.keyBoxIdentifier"
+								value="%{authOA.keyBoxIdentifier}"
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.keyboxidentifier"
+								cssClass="radio">
+							</s:radio>						
+							<s:checkbox name="authOA.legacy" 
+								value="%{authOA.legacy}"
+								labelposition="left"
+								key="webpages.oaconfig.general.bku.legacy"
+								cssClass="checkbox"
+								onclick="oaLegacyService();"
+								id="OAislegacy">
+							</s:checkbox>
+							<div id="oa_config_sltemplates">
+								<s:textfield name="authOA.SLTemplateURL1" 
+									value="%{authOA.SLTemplateURL1}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.sltemplate.first"
+									cssClass="textfield_long">
+								</s:textfield>
+								<s:textfield name="authOA.SLTemplateURL2" 
+									value="%{authOA.SLTemplateURL2}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.sltemplate.second"
+									cssClass="textfield_long">
+								</s:textfield>
+								<s:textfield name="authOA.SLTemplateURL3" 
+									value="%{authOA.SLTemplateURL3}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.sltemplate.third"
+									cssClass="textfield_long">
+								</s:textfield>
+							</div>
+					</div>
+				</s:if>	
+
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.mandate.header", request) %></h3>
+						
+						
+						<s:checkbox name="authOA.useMandates" 
+												value="%{authOA.useMandates}"
+												labelposition="left"
+												key="webpages.oaconfig.general.mandate.usemandate"
+												cssClass="checkbox">
+						</s:checkbox>	
+						
+						<s:textfield name="authOA.mandateProfiles" 
+							value="%{authOA.mandateProfiles}" 
+							labelposition="left"
+							key="webpages.oaconfig.general.mandate.profiles"
+							cssClass="textfield_long">
+						</s:textfield>
+						
+						<s:checkbox name="formOA.onlyMandateAllowed" 
+									value="%{formOA.onlyMandateAllowed}"
+									labelposition="left"
+									key="webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed"
+									cssClass="checkbox">
+						</s:checkbox>
+						
+					</div>						
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/blank.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/blank.jsp
new file mode 100644
index 000000000..ba7dc2cc4
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/blank.jsp
@@ -0,0 +1,8 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
new file mode 100644
index 000000000..008a8b521
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/formCustomization.jsp
@@ -0,0 +1,209 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.aditional.header", request) %></h3>
+												
+<%-- 				<s:checkbox name="generalOA.calculateHPI" 
+							value="%{generalOA.calculateHPI}"
+							labelposition="left"
+							key="webpages.oaconfig.general.aditional.calculateHPI"
+							cssClass="textfield_long">
+						</s:checkbox> --%>
+						
+						<s:checkbox name="formOA.HideBPKAuthBlock" 
+							value="%{formOA.HideBPKAuthBlock}"
+							labelposition="left"
+							key="webpages.oaconfig.general.isHideBPKAuthBlock"
+							cssClass="checkbox">
+						</s:checkbox>
+						
+						<s:if test="authUser.isAdmin()">						
+							<s:textarea name="formOA.aditionalAuthBlockText" 
+								value="%{formOA.aditionalAuthBlockText}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.aditional.authblocktext"
+								cssClass="textfield_large">
+							</s:textarea>
+													
+							<button type="button" class="oa_buttons" onclick="oaFormCustom();" id="formcustom_button_show">
+								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.show", request) %>
+						  </button>
+							<button type="button" class="oa_buttons" onclick="oaFormCustom();" id="formcustom_button_hidden">
+								<%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.button.hidden", request) %>
+						  </button>
+						  						
+							<div id="formcustom_area" class="oa_protocol_area hidden">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.BKUSelection.header", request) %></h4>
+																
+								<div id="formCustomValues">													
+									<s:textfield name="formOA.backGroundColor" 
+										value="%{formOA.backGroundColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.backgroundcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("MAIN_BACKGOUNDCOLOR")'
+										id="MAIN_BACKGOUNDCOLOR">
+									</s:textfield>								
+									<s:textfield name="formOA.frontColor" 
+										value="%{formOA.frontColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.frontcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("MAIN_COLOR")'
+										id="MAIN_COLOR">
+									</s:textfield>
+									
+									<s:textfield name="formOA.header_BackGroundColor" 
+										value="%{formOA.header_BackGroundColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.backgroundcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("HEADER_BACKGROUNDCOLOR")'
+										id="HEADER_BACKGROUNDCOLOR">
+									</s:textfield>
+									<s:textfield name="formOA.header_FrontColor" 
+										value="%{formOA.header_FrontColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.frontcolor"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("HEADER_COLOR")'
+										id="HEADER_COLOR">
+									</s:textfield>
+									<s:textfield name="formOA.header_text" 
+										value="%{formOA.header_text}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.text"
+										cssClass="textfield_middle"
+										onchange='updateBKUFormPreview("HEADER_TEXT")'
+										id="HEADER_TEXT">
+									</s:textfield>
+									
+	<%-- 							<s:textfield name="formOA.button_BackGroundColor" 
+										value="%{formOA.button_BackGroundColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.button.background"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("BUTTON_BACKGROUNDCOLOR")'
+										id="BUTTON_BACKGROUNDCOLOR">
+									</s:textfield>
+									<s:textfield name="formOA.button_BackGroundColorFocus" 
+										value="%{formOA.button_BackGroundColorFocus}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.button.background.focus"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("BUTTON_BACKGROUNDCOLOR_FOCUS")'
+										id="BUTTON_BACKGROUNDCOLOR_FOCUS">
+									</s:textfield>
+									<s:textfield name="formOA.button_FrontColor" 
+										value="%{formOA.button_FrontColor}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.button.front"
+										cssClass="textfield_middle colorfield"
+										onchange='updateBKUFormPreview("BUTTON_COLOR")'
+										id="BUTTON_COLOR">
+									</s:textfield> --%>
+									
+									<s:select list="formOA.appletRedirectTargetList"
+														key="webpages.oaconfig.general.BKUSelection.redirectTarget"
+														labelposition="left"
+														cssClass="selectfield"
+														value="%{formOA.appletRedirectTarget}"
+														name="formOA.appletRedirectTarget">
+									</s:select>
+									
+									<s:textfield name="formOA.applet_height" 
+										value="%{formOA.applet_height}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.applet.height"
+										cssClass="textfield_middle"
+										id="HEADER_HEIGHT">
+									</s:textfield>
+									
+									<s:textfield name="formOA.applet_width" 
+										value="%{formOA.applet_width}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.BKUSelection.header.applet.width"
+										cssClass="textfield_middle"
+										id="HEADER_WIDTH">
+									</s:textfield>
+									
+									<s:select list="formOA.fontTypeList"
+														key="webpages.oaconfig.general.BKUSelection.fonttype.list"
+														labelposition="left"
+														cssClass="selectfield"
+														value="%{formOA.fontType}"
+														name="formOA.fontTypeListValue"
+														id="fontTypeList"
+														onchange='$("#FONTTYPE").val($("#fontTypeList").val());updateBKUFormPreview("FONTTYPE");'>
+									</s:select>
+									
+									<s:textfield 	name="formOA.fontType" 
+																value="%{formOA.fontType}" 
+																labelposition="left"
+																key="webpages.oaconfig.general.BKUSelection.fonttype"
+																cssClass="textfield_mail"													
+																onchange='updateBKUFormPreview("FONTTYPE")'
+																id="FONTTYPE">
+									</s:textfield>		
+								</div>
+								
+								<div id="formCustomPreview">
+										<iframe scrolling="none" 
+														title="BKUForm Preview"
+														height="260"
+														width="250">
+										</iframe>
+								</div>
+																
+							</div>
+							
+														<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.bkuselection.header", request) %></h4>
+								<s:iterator value="%{formOA.bkuSelectionFileUploadFileName}" var="fileNameBKU">
+									<div class="floatClass">
+										<s:label key="webpages.oaconfig.general.bku.bkuselection.filename" value="%{fileNameBKU}"/>
+										<s:checkbox key="webpages.oaconfig.general.bku.delete"
+																labelposition="left"														
+																cssClass="checkbox"
+																name="formOA.deleteBKUTemplate"></s:checkbox>
+									</div>
+									<div id="pvp2_certificate_upload">
+										<s:file name="formOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:iterator>
+								<s:if test="formOA.bkuSelectionFileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+										<s:file name="formOA.bkuSelectionFileUpload" key="webpages.oaconfig.general.bku.bkuselection.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>
+							</div>
+							<div class="oa_protocol_area">
+								<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.sendassertion.header", request) %></h4>
+								<s:iterator value="%{formOA.sendAssertionFileUploadFileName}" var="fileNameBKU">
+									<div class="floatClass">
+										<s:label 	key="webpages.oaconfig.general.bku.sendassertion.filename" 
+															value="%{fileNameBKU}"/>
+										<s:checkbox key="webpages.oaconfig.general.bku.delete"
+																labelposition="left"														
+																cssClass="checkbox"
+																name="formOA.deleteSendAssertionTemplate"></s:checkbox>
+									</div>
+									<div id="pvp2_certificate_upload">
+										<s:file name="formOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:iterator>
+								<s:if test="formOA.sendAssertionFileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+										<s:file name="formOA.sendAssertionFileUpload" key="webpages.oaconfig.general.bku.sendassertion.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>
+							</div>
+							
+						</s:if>
+							
+					</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
new file mode 100644
index 000000000..ade5bb185
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/generalInformation.jsp
@@ -0,0 +1,43 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+
+					<div class="oa_config_block">
+					
+						<s:if test="authUser.isAdmin()">
+							<s:checkbox name="generalOA.Active" 
+								value="%{generalOA.Active}"
+								labelposition="left"
+								key="webpages.oaconfig.general.isActive"
+								cssClass="checkbox">
+							</s:checkbox>
+						</s:if>
+					
+						<s:textfield name="generalOA.identifier" 
+							value="%{generalOA.identifier}" 
+							labelposition="left"
+							key="webpages.oaconfig.general.identification"
+							cssClass="textfield_long">
+						</s:textfield>
+									
+ 						<s:textfield name="generalOA.friendlyName" 
+							value="%{generalOA.friendlyName}" 
+							labelposition="left"
+							key="webpages.oaconfig.general.friendlyname"
+							cssClass="textfield_long">
+						</s:textfield>
+
+          	<s:checkbox 	name="generalOA.businessService"
+                          value="%{generalOA.businessService}"
+                          labelposition="left"
+                          key="webpages.oaconfig.general.isbusinessservice"
+                          cssClass="checkbox"
+                          onclick="oaBusinessService();"
+                          id="OAisbusinessservice"
+                          >
+            </s:checkbox>
+
+					</div>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp
new file mode 100644
index 000000000..97d21bcb4
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/interfederation.jsp
@@ -0,0 +1,33 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+	<div id="oa_pvp2_area" class="oa_protocol_area">
+		<h4><%=LanguageHelper.getGUIString("webpages.inderfederation.moaid.header", request) %></h4>
+						
+		<s:checkbox 	key="webpages.inderfederation.moaid.inboundSSO"
+									labelposition="left"														
+									cssClass="checkbox"
+									name="moaIDP.inboundSSO"></s:checkbox>
+									
+		<s:checkbox 	key="webpages.inderfederation.moaid.outboundSSO"
+									labelposition="left"														
+									cssClass="checkbox"
+									name="moaIDP.outboundSSO"></s:checkbox>									
+
+		<s:checkbox 	key="webpages.inderfederation.moaid.storeSSOSession"
+									labelposition="left"														
+									cssClass="checkbox"
+									name="moaIDP.storeSSOSession"></s:checkbox>
+						
+		<s:textfield name="moaIDP.queryURL" 
+		 						 value="%{moaIDP.queryURL}" 
+								 labelposition="left"
+								 key="webpages.inderfederation.moaid.attributQueryURL"
+								 cssClass="textfield_long">
+		</s:textfield>
+						
+	</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/openIDConnect.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/openIDConnect.jsp
new file mode 100644
index 000000000..a9b1f88a2
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/openIDConnect.jsp
@@ -0,0 +1,21 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+						<div id="oa_oauth20_area" class="oa_protocol_area hidden">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.oauth20.header", request) %></h4>
+						
+							<s:label key="webpages.oaconfig.oauth20.clientId" value="%{oauth20OA.clientId}"/>
+							
+							<s:label key="webpages.oaconfig.oauth20.clientSecret" value="%{oauth20OA.clientSecret}"/>
+														
+							<s:textfield name="oauth20OA.redirectUri" 
+								value="%{oauth20OA.redirectUri}" 
+								labelposition="left"
+								key="webpages.oaconfig.oauth20.redirectUri"
+								cssClass="textfield_long">
+							</s:textfield>
+						</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
new file mode 100644
index 000000000..398e6d110
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/pvp2.jsp
@@ -0,0 +1,28 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+						<div id="oa_pvp2_area" class="oa_protocol_area ${param.hideBlock}">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.pvp2.header", request) %></h4>
+						
+							<s:checkbox 	key="webpages.oaconfig.pvp2.reload"
+														labelposition="left"														
+														cssClass="checkbox"
+														name="pvp2OA.reLoad"></s:checkbox>
+						
+						  <s:textfield name="pvp2OA.metaDataURL" 
+								value="%{pvp2OA.metaDataURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.pvp2.metaDataURL"
+								cssClass="textfield_long">
+							</s:textfield>
+						
+							<s:label key="webpages.oaconfig.pvp2.certifcate.info" value="%{pvp2OA.certificateDN}"/>
+							
+							<div id="pvp2_certificate_upload">
+								<s:file name="pvp2OA.fileUpload" key="webpages.oaconfig.pvp2.certifcate" cssClass="textfield_long"></s:file>
+							</div>
+						</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
new file mode 100644
index 000000000..4fd02aa61
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
@@ -0,0 +1,66 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+						<div id="oa_saml1_area" class="oa_protocol_area hidden">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.saml1.header", request) %></h4>
+							
+							<s:if test="authUser.isAdmin()">
+								<s:checkbox name="saml1OA.Active" 
+									value="%{saml1OA.Active}"
+									labelposition="left"
+									key="webpages.oaconfig.saml1.isActice"
+									cssClass="checkbox">
+								</s:checkbox>
+							</s:if>
+							<s:checkbox name="saml1OA.provideStammZahl" 
+								value="%{saml1OA.provideStammZahl}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.provideStammZahl"
+								cssClass="checkbox">
+							</s:checkbox>
+							<s:checkbox name="saml1OA.provideAuthBlock" 
+								value="%{saml1OA.provideAuthBlock}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.provideAuthBlock"
+								cssClass="checkbox">
+							</s:checkbox>
+							<br>
+							<s:checkbox name="saml1OA.provideIdentityLink" 
+								value="%{saml1OA.provideIdentityLink}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.provideIdentityLink"
+								cssClass="checkbox">
+							</s:checkbox>							
+							<s:checkbox name="saml1OA.provideCertificate" 
+								value="%{saml1OA.provideCertificate}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.provideCertificate"
+								cssClass="checkbox">
+							</s:checkbox>
+							<s:checkbox name="saml1OA.provideFullMandateData" 
+								value="%{saml1OA.provideFullMandateData}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.provideFullMandateData"
+								cssClass="checkbox">
+							</s:checkbox>
+<%-- 							<br>
+							<br>
+							<br>
+							<s:checkbox name="saml1OA.useCondition" 
+								value="%{saml1OA.useCondition}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.useCondition"
+								cssClass="checkbox">
+							</s:checkbox>
+							<s:textfield name="saml1OA.conditionLength" 
+								value="%{saml1OA.conditionLength}" 
+								labelposition="left"
+								key="webpages.oaconfig.saml1.conditionLength"
+								cssClass="textfield_short">
+							</s:textfield> --%>
+							
+						</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/sso.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/sso.jsp
new file mode 100644
index 000000000..f39668bd5
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/sso.jsp
@@ -0,0 +1,39 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+						<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.sso.header", request) %></h3>
+						
+						<s:checkbox name="ssoOA.useSSO" 
+							value="%{ssoOA.useSSO}"
+							labelposition="left"
+							key="webpages.oaconfig.sso.usesso"
+							cssClass="checkbox"
+							onclick="oaSSOService();"
+							id="OAuseSSO">
+						</s:checkbox>
+						
+						<div id="sso_bock">
+							<s:if test="authUser.isAdmin()">
+								<s:checkbox name="ssoOA.showAuthDataFrame" 
+									value="%{ssoOA.showAuthDataFrame}"
+									labelposition="left"
+									key="webpages.oaconfig.sso.useauthdataframe"
+									cssClass="checkbox"
+									onclick="oaBusinessService();">
+								</s:checkbox>
+							</s:if>
+					
+<%--TODO: insert if SLO is implemented!!!--%> 
+<%--							<s:textfield name="ssoOA.singleLogOutURL" 
+								value="%{ssoOA.singleLogOutURL}" 
+								labelposition="left"
+								key="webpages.oaconfig.sso.singlelogouturl"
+								cssClass="textfield_long">
+							</s:textfield> --%>
+						</div>
+					</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
new file mode 100644
index 000000000..f1853dbeb
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/stork.jsp
@@ -0,0 +1,38 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+
+						<s:checkbox name="storkOA.storkLogonEnabled" 
+							value="%{storkOA.storkLogonEnabled}"
+							labelposition="left"
+							key="webpages.oaconfig.stork.usestork"
+							cssClass="checkbox"
+							onclick="oaStork();"
+							id="OAuseSTORKLogon" />
+						<div id="stork_block">
+							<s:select list="#{1:'1', 2:'2', 3:'3', 4:'4'}"
+								value="#{storkOA.qaa}"
+								name="storkOA.qaa"
+								key="webpages.moaconfig.stork.qaa"
+								labelposition="left" />
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.enabledcpeps", request) %></h4>
+							<s:checkboxlist name="storkOA.enabledCitizenCountries" list="storkOA.availableCitizenCountries" value="storkOA.enabledCitizenCountries" />
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.header", request) %></h4>
+							<table>
+								<tr><th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.used", request) %></th>
+								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.name", request) %></th>
+								    <th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.mandatory", request) %></th></tr>
+								<s:iterator value="storkOA.helperAttributes" status="stat">
+									<tr><td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].used" value="%{used}" disabled="%{readOnly}" /></td>
+										<td><s:property value="%{name}" /><s:hidden name="storkOA.helperAttributes[%{#stat.index}].name" value="%{name}" /></td>
+										<td><s:checkbox name="storkOA.helperAttributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td></tr>
+								</s:iterator>
+							</table>
+						</div>
+					</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
new file mode 100644
index 000000000..261966a86
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -0,0 +1,115 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>          
+ 					<div id="oa_config_businessservice" class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.business.header", request) %></h3>
+						
+						<s:select list="targetConfig.identificationTypeList"
+											key="webpages.oaconfig.general.business.value"
+											labelposition="left"
+											cssClass="selectfield"
+											value="%{targetConfig.identificationType}"
+											name="targetConfig.identificationType"
+											disabled="%{isDeaktivededBusinessService()}">
+						</s:select>
+						
+						<s:textfield name="targetConfig.identificationNumber" 
+							value="%{targetConfig.identificationNumber}" 
+							cssClass="textfield_middle"
+							disabled="%{isDeaktivededBusinessService()}">
+						</s:textfield>		
+					</div>
+					
+					<s:if test="!isOnlyBusinessService()">
+						<div id="oa_config_publicservice" class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.public.header", request) %></h3>
+							
+							<s:if test="authUser.isAdmin()">
+								<s:select list="targetConfig.targetList"
+													key="webpages.oaconfig.general.target"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{targetConfig.target}"
+													name="targetConfig.target"
+													onchange="HideAdminTarget();">
+								</s:select>						
+							</s:if>
+							<s:else>
+								<s:select list="targetConfig.targetList"
+													key="webpages.oaconfig.general.target"
+													labelposition="left"
+													cssClass="selectfield"
+													value="%{targetConfig.target}"
+													name="targetConfig.target">
+								</s:select>
+							</s:else>
+							
+							<s:checkbox name="subTargetSet" 
+								value="%{subTargetSet}"
+								labelposition="left"
+								key="webpages.oaconfig.general.target.subsector.checkbox"
+								cssClass="checkbox"
+								onclick="oaTargetSubSector();"
+								id="OAisTargetSubSector">
+							</s:checkbox>
+							
+							<s:textfield name="targetConfig.target_subsector" 
+								value="%{targetConfig.target_subsector}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.target.subsector"
+								cssClass="selectfield"
+								id="OAtarget_subsector">
+							</s:textfield>
+							
+							
+	 						<s:if test="authUser.isAdmin()">
+	 							<s:checkbox
+		 							name="targetConfig.AdminTarget" 
+									value="%{targetConfig.AdminTarget}"
+									cssClass="checkbox"
+	 								onclick="AdminTarget();"
+	 								labelposition="left"
+									key="webpages.oaconfig.general.target.admin.checkbox"
+									id="adminTarget">
+	 							</s:checkbox>
+	 							
+	 							<div id="admin_target_area">
+									<s:textfield name="targetConfig.target_admin" 
+										value="%{targetConfig.target_admin}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.admin"
+										cssClass="textfield_short">
+									</s:textfield>
+									<s:textfield name="targetConfig.targetFriendlyName" 
+										value="%{targetConfig.targetFriendlyName}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.friendlyname"
+										cssClass="textfield_long">
+									</s:textfield>
+								</div>
+	 						</s:if>
+	 						<s:else>
+	 							<s:if test="targetConfig.target_admin neq null">
+	 								<s:textfield name="targetConfig.target_admin" 
+										value="%{targetConfig.target_admin}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.admin.disabled"
+										cssClass="textfield_short"
+										disabled="true">
+									</s:textfield>
+								</s:if>
+	<%-- 							<s:if test="targetConfig.targetFriendlyName neq null">
+									<s:textfield name="targetConfig.targetFriendlyName" 
+										value="%{targetConfig.targetFriendlyName}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.target.friendlyname.disabled"
+										cssClass="textfield_long">
+									</s:textfield>
+								</s:if> --%>
+	 						</s:else>
+						</div>
+					</s:if>
+
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp
new file mode 100644
index 000000000..e8f1c86d3
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/vidp.jsp
@@ -0,0 +1,36 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+						<div id="oa_vidp_area" class="oa_protocol_area ${param.hideBlock}">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
+	
+							<p><s:checkbox name="storkOA.vidpEnabled" 
+								value="%{storkOA.vidpEnabled}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.enabled"
+								cssClass="checkbox"
+								id="OAuseVidp" /></p>
+								
+							<p><s:checkbox name="storkOA.requireConsent"
+								value="%{storkOA.requireConsent}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.requireconsent"
+								cssClass="checkbox"
+								id="OArequireConsent" /></p>
+							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
+							<table id="stork_aplist">
+								<tr><th>AP Plugin</th><th>URL</th><th>Attribute (CSV)</th></tr>
+								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].name" value="%{name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield_mail"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].attributes" value="%{attributes}" cssClass="textfield_mail"/></td>
+								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.new", request) %>" onclick='newAp();' />
+								
+						</div>
+				
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
index 4d02f4bda..95d6de912 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -19,6 +19,10 @@
 			
 			<s:if test="authUser.isAdmin()">
 				<div class="menu_element">
+						<s:url action="listallinterfederationidps" var="interfederationConfig" namespace="/secure"/>
+						<a href="<s:property value="#interfederationConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.interfederation", request) %></a>
+				</div>			
+				<div class="menu_element">
 						<s:url action="loadGeneralConfig" var="generalConfig" namespace="/secure"/>
 						<a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a>
 				</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
index 113e822f8..e2af292d7 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
@@ -1,4 +1,5 @@
 <%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@page import="at.gv.egovernment.moa.id.configuration.data.OAListElement.ServiceType"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 
@@ -6,6 +7,11 @@
 		<s:if test="formOAs && formOAs.size > 0">	
 			<div id="list_area">
 					<div id="listHeader" class="listElement">
+						<s:if test="formOAs[0].serviceType != 'OA'">
+							<div class="listElInfo">
+								<%=LanguageHelper.getGUIString("webpages.listOAs.list.elInfo", request) %>
+							</div>
+						</s:if>
 						<div class="listFirst">
 							<%=LanguageHelper.getGUIString("webpages.listOAs.list.first", request) %>
 						</div>
@@ -17,6 +23,11 @@
 				<s:iterator var="OAelement" value="formOAs">
 
 					<div class="listElement" onclick="editOA(<s:property value='dataBaseID'/>);">
+						<s:if test="serviceType != 'OA'">
+							<div class="listElInfo">
+								<s:property value="serviceType"/>
+							</div>
+ 						</s:if>
 						<div class="listFirst">
 							<s:property value="oaIdentifier"/>
 						</div>
@@ -28,7 +39,8 @@
 				</s:iterator>
 			</div>
 			
-			<s:form method="POST" id="selectOAForm" action="loadOA" namespace="/secure">
+			<s:set var="myUrl">${param.editAction}</s:set>
+			<s:form method="POST" id="selectOAForm" action="%{#myUrl}" namespace="/secure">
 				<s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden>
 			</s:form> 
 		</s:if>