diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-account-activation.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-account-activation.xml
index 8a71e4d8e..6cad3de99 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-account-activation.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-account-activation.xml
@@ -31,14 +31,14 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false" />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
                     password_reset_required="false" />
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-email-verification.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-email-verification.xml
index a616150dc..47cb4a2cb 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-email-verification.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-email-verification.xml
@@ -31,16 +31,15 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false" />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
     />
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-password-recovery.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-password-recovery.xml
index 86cd2210d..93ca19679 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-password-recovery.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-password-recovery.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,9 +39,8 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
     />
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-account-activation.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-account-activation.xml
index 7de7ae6df..cf667cf70 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-account-activation.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-account-activation.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,9 +39,8 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    bouncing="false"
                     banned="false"
                     password_reset_required="false"
     />
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-email-verification.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-email-verification.xml
index 28721542e..4f49898fd 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-email-verification.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-email-verification.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                     primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
+                     primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +39,7 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
                     password_reset_required="false"
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-password-recovery.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-password-recovery.xml
index 00b4bcdff..0b37907b5 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-password-recovery.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-finish-password-recovery.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,11 +39,10 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="true"
                     password_reset_required="false"
-                    verified="false"
     />
 </dataset>
 
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/data.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/data.xml
index a363d522a..7b63e36c5 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/data.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/data.xml
@@ -31,14 +31,14 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false" />
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": true}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": true}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
                     password_reset_required="false" />
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-account-activation.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-account-activation.xml
index 9a766cb5c..a38b3f417 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-account-activation.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-account-activation.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +39,7 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="true"
                     password_reset_required="false"
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-email-verification.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-email-verification.xml
index cce9ef40a..4b8c322ea 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-email-verification.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-email-verification.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +39,7 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
                     password_reset_required="false"
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-password-recovery.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-password-recovery.xml
index 6794585d7..07d8eaee2 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-password-recovery.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/finish-password-recovery.xml
@@ -31,7 +31,7 @@
     <ccm_core.users party_id="-10"
                     family_name="Doe"
                     given_name="John"
-                    primary_email_address='{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "john.doe@example.com", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +39,7 @@
     <ccm_core.users party_id="-20"
                     family_name="Mustermann"
                     given_name="Max"
-                    primary_email_address='{\"address\": \"max.muster@example.org\", \"bouncing\": false, \"verified\": false}'
+                    primary_email_address='{"address": "max.muster@example.org", "bouncing": false, "verified": false}'
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="true"
                     password_reset_required="false"