1 files changed, 9 insertions, 5 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
index e2d473f8a..ecf0d19d7 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/FormularCustomization.java
@@ -254,12 +254,16 @@ public class FormularCustomization implements IOnlineApplicationData {
         //store BKU-selection and send-assertion templates
         if (authUser.isAdmin()) {
 
-            if (isDeleteBKUTemplate())
-                templates.setBKUSelectionTemplate(null);
-
-            if (isDeleteSendAssertionTemplate())
-                templates.setSendAssertionTemplate(null);
+            if (isDeleteBKUTemplate() && templates.getBKUSelectionTemplate() != null) {
+                //templates.setBKUSelectionTemplate(null);
+                templates.getBKUSelectionTemplate().setDelete(true);
+            }
 
+            if (isDeleteSendAssertionTemplate() && templates.getSendAssertionTemplate() != null) {
+                //templates.setSendAssertionTemplate(null);
+                templates.getSendAssertionTemplate().setDelete(true);
+            }
+        
 
             if (bkuSelectionForm != null && bkuSelectionForm.size() > 0) {
                 TransformsInfoType template = new TransformsInfoType();