1 files changed, 13 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index ec261335d..ef0672e99 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -512,9 +512,20 @@ public class EditGeneralConfigAction extends BasicAction {
 				else
 					stork.setAttributes((List<StorkAttribute>) (new ArrayList<StorkAttribute>()));
 				
-				if (storkconfig.getCpepslist() != null)
+				if (storkconfig.getCpepslist() != null) {
+
+					// make CountryCode "readonly"
+					for(CPEPS newone : storkconfig.getCpepslist()) {
+						for(CPEPS current : stork.getCPEPS()) {
+							if(current.getHjid().equals(newone.getHjid())) {
+								newone.setCountryCode(current.getCountryCode());
+								break;
+							}
+						}
+					}
+
 					stork.setCPEPS(storkconfig.getCpepslist());
-				
+				}
 				else
 					stork.setCPEPS((List<CPEPS>) (new ArrayList<CPEPS>()));