diff --git a/ccm-core/src/main/java/com/arsdigita/ui/UserBanner.java b/ccm-core/src/main/java/com/arsdigita/ui/UserBanner.java
index 35889ea2d..19366131d 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/UserBanner.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/UserBanner.java
@@ -80,8 +80,7 @@ public class UserBanner extends SimpleComponent {
                 contentElem.addAttribute("screenName", 
                                          user.get().getName());
                 contentElem.addAttribute("primaryEmail",
-                                         user.get().getPrimaryEmailAddress()
-                                         .getAddress());
+                                         user.get().getPrimaryEmailAddress());
                 contentElem.addAttribute("userID",
                                          Long.toString(user.get().getPartyId()));
             }
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupAddMemberForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupAddMemberForm.java
index 67c1fa26a..129e068de 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupAddMemberForm.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupAddMemberForm.java
@@ -267,7 +267,7 @@ class GroupAddMemberForm extends Form {
                 case COL_MEMBER_GIVEN_NAME:
                     return user.getGivenName();
                 case COL_MEMBER_EMAIL:
-                    return user.getPrimaryEmailAddress().getAddress();
+                    return user.getPrimaryEmailAddress();
                 case COL_MEMBER_ADD:
                     return new Label(new GlobalizedMessage(
                         "ui.admin.group_details.add_member.table.add",
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupMembersTable.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupMembersTable.java
index 92ba2545a..9e7abd3c5 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupMembersTable.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/groups/GroupMembersTable.java
@@ -221,7 +221,7 @@ class GroupMembersTable extends Table {
                 case COL_MEMBER_GIVEN_NAME:
                     return member.getGivenName();
                 case COL_MEMBER_EMAIL:
-                    return member.getPrimaryEmailAddress().getAddress();
+                    return member.getPrimaryEmailAddress();
                 case COL_MEMBER_REMOVE:
                     return new Label(new GlobalizedMessage(
                         "ui.admin.group_details.members_table.remove",
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/EmailForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/EmailForm.java
index a963d5b24..61c85a012 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/EmailForm.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/EmailForm.java
@@ -95,8 +95,11 @@ class EmailForm extends Form {
                 final User user = userRepository.findById(Long.parseLong(
                     userIdStr)).get();
                 EmailAddress email = null;
-                if (user.getPrimaryEmailAddress().getAddress().equals(selected)) {
-                    email = user.getPrimaryEmailAddress();
+                if (user.getPrimaryEmailAddress().equals(selected)) {
+                    email = new EmailAddress();
+                    email.setAddress(user.getPrimaryEmailAddress());
+                    email.setBouncing(user.isPrimaryEmailAddressBouncing());
+                    email.setVerified(user.isPrimaryEmailAddressVerified());
                 } else {
                     for (EmailAddress current : user.getEmailAddresses()) {
                         if (current.getAddress().equals(selected)) {
@@ -152,9 +155,12 @@ class EmailForm extends Form {
                 if (selected == null) {
                     email = new EmailAddress();
                     user.addEmailAddress(email);
-                } else if (user.getPrimaryEmailAddress().getAddress().equals(
+                } else if (user.getPrimaryEmailAddress().equals(
                     selected)) {
-                    email = user.getPrimaryEmailAddress();
+                    email = new EmailAddress();
+                    email.setAddress(user.getPrimaryEmailAddress());
+                    email.setBouncing(user.isPrimaryEmailAddressBouncing());
+                    email.setVerified(user.isPrimaryEmailAddressVerified());
                 } else {
                     for (EmailAddress current : user.getEmailAddresses()) {
                         if (current.getAddress().equals(selected)) {
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/PrimaryEmailTableModel.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/PrimaryEmailTableModel.java
index 7802ea487..e2728bfd5 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/PrimaryEmailTableModel.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/PrimaryEmailTableModel.java
@@ -64,11 +64,11 @@ class PrimaryEmailTableModel implements TableModel {
     public Object getElementAt(final int columnIndex) {
         switch(columnIndex) {
             case COL_ADDRESS:
-                return user.getPrimaryEmailAddress().getAddress();
+                return user.getPrimaryEmailAddress();
             case COL_VERIFIED:
-                return Boolean.toString(user.getPrimaryEmailAddress().isVerified());
+                return Boolean.toString(user.isPrimaryEmailAddressVerified());
             case COL_BOUNCING:
-                return Boolean.toString(user.getPrimaryEmailAddress().isBouncing());
+                return Boolean.toString(user.isPrimaryEmailAddressBouncing());
             case COL_ACTION:
                 return new Label(new GlobalizedMessage(
                     "ui.admin.user.primary_email_address.edit", ADMIN_BUNDLE));
@@ -79,7 +79,7 @@ class PrimaryEmailTableModel implements TableModel {
 
     @Override
     public Object getKeyAt(final int columnIndex) {
-        return user.getPrimaryEmailAddress().getAddress();
+        return user.getPrimaryEmailAddress();
     }
     
 }
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java
index 82468b21f..a56e70338 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java
@@ -201,7 +201,7 @@ class UsersTable extends Table {
                 case COL_GIVEN_NAME:
                     return user.getGivenName();
                 case COL_PRIMARY_EMAIL:
-                    return user.getPrimaryEmailAddress().getAddress();
+                    return user.getPrimaryEmailAddress();
                 case COL_SCREEN_NAME:
                     return user.getName();
                 default:
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/login/EmailInitListener.java b/ccm-core/src/main/java/com/arsdigita/ui/login/EmailInitListener.java
index 9a2ed9d8e..7840c095c 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/login/EmailInitListener.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/login/EmailInitListener.java
@@ -77,7 +77,7 @@ public class EmailInitListener implements FormInitListener {
         
         
 
-        data.put(m_param.getName(), user.getPrimaryEmailAddress().getAddress());
+        data.put(m_param.getName(), user.getPrimaryEmailAddress());
         
         LOGGER.debug("SUCCESS");
     }
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/login/UserEditForm.java b/ccm-core/src/main/java/com/arsdigita/ui/login/UserEditForm.java
index ef65ace1a..dc79c94df 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/login/UserEditForm.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/login/UserEditForm.java
@@ -116,11 +116,9 @@ public class UserEditForm extends UserForm
         user.setFamilyName((String) m_lastName.getValue(state));
         user.setName((String) m_screenName.getValue(state));
         final String emailValue = (String) data.get(FORM_EMAIL);
-        if (!emailValue.equals(user.getPrimaryEmailAddress().getAddress())) {
-            final EmailAddress newAddress = new EmailAddress();
-            newAddress.setAddress(data.get(FORM_EMAIL).toString());
-            newAddress.setVerified(false);
-            user.setPrimaryEmailAddress(newAddress);
+        if (!emailValue.equals(user.getPrimaryEmailAddress())) {
+            user.setPrimaryEmailAddress(data.get(FORM_EMAIL).toString());
+            user.setPrimaryEmailAddressVerified(false);
 
             final ChallengeManager challengeManager = CdiUtil.createCdiUtil()
                 .findBean(ChallengeManager.class);
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/login/UserForm.java b/ccm-core/src/main/java/com/arsdigita/ui/login/UserForm.java
index 38e55c2ce..3744b1133 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/login/UserForm.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/login/UserForm.java
@@ -223,7 +223,7 @@ public abstract class UserForm extends Form
         }
         m_firstName.setValue(state, user.getGivenName());
         m_lastName.setValue(state, user.getFamilyName());
-        m_email.setValue(state, user.getPrimaryEmailAddress().getAddress());
+        m_email.setValue(state, user.getPrimaryEmailAddress());
         m_screenName.setValue(state, user.getName());
 
     }
@@ -283,7 +283,7 @@ public abstract class UserForm extends Form
                 }
             }
 
-            final String oldEmail = user.getPrimaryEmailAddress().getAddress();
+            final String oldEmail = user.getPrimaryEmailAddress();
             final String email = (String) m_email.getValue(state);
             if (KernelConfig.getConfig().emailIsPrimaryIdentifier()
                     && email != null && !email.equals(oldEmail)) {
diff --git a/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java b/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java
index 387a972b8..8d9cdfb85 100644
--- a/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java
+++ b/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java
@@ -46,6 +46,7 @@ import javax.validation.constraints.NotBlank;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Deprecated
 @XmlRootElement(name = "email-address", namespace = CORE_XML_NS)
 public class EmailAddress implements Serializable {
 
diff --git a/ccm-core/src/main/java/org/libreccm/security/ChallengeManager.java b/ccm-core/src/main/java/org/libreccm/security/ChallengeManager.java
index be36424bc..1cb4ea1a5 100644
--- a/ccm-core/src/main/java/org/libreccm/security/ChallengeManager.java
+++ b/ccm-core/src/main/java/org/libreccm/security/ChallengeManager.java
@@ -154,7 +154,7 @@ public class ChallengeManager {
                             submittedToken,
                             OneTimeAuthTokenPurpose.EMAIL_VERIFICATION)) {
 
-            user.getPrimaryEmailAddress().setVerified(true);
+            user.setPrimaryEmailAddressVerified(true);
             userRepository.save(user);
 
         } else {
@@ -344,7 +344,7 @@ public class ChallengeManager {
                    .getURL());
 
         final ParameterMap params = new ParameterMap();
-        params.setParameter("email", user.getPrimaryEmailAddress().getAddress());
+        params.setParameter("email", user.getPrimaryEmailAddress());
         params.setParameter("token", token.getToken());
         values.put("full_link",
                    URL.there(request,
@@ -505,7 +505,7 @@ public class ChallengeManager {
         final KernelConfig kernelConfig = configurationManager
             .findConfiguration(KernelConfig.class);
 
-        final Mail mail = new Mail(user.getPrimaryEmailAddress().getAddress(),
+        final Mail mail = new Mail(user.getPrimaryEmailAddress(),
                                    kernelConfig.getSystemEmailAddress(),
                                    subject);
         mail.setBody(text);
diff --git a/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java b/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
index 3b84eceae..f6aee4557 100644
--- a/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
+++ b/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
@@ -85,9 +85,9 @@ public class SystemUsersSetup {
         admin.setName(adminName);
         admin.setFamilyName(adminFamilyName);
         admin.setGivenName(adminGivenName);
-        final EmailAddress adminEmail = new EmailAddress();
-        adminEmail.setAddress(adminEmailAddress);
-        admin.setPrimaryEmailAddress(adminEmail);
+        admin.setPrimaryEmailAddress(adminEmailAddress);
+        admin.setPrimaryEmailAddressBouncing(false);
+        admin.setPrimaryEmailAddressVerified(true);
         admin.setPassword(adminPassword);
 
         final Role adminRole = new Role();
@@ -119,9 +119,9 @@ public class SystemUsersSetup {
         user.setName("public-user");
         user.setFamilyName("LibreCCM");
         user.setGivenName("Public User");
-        final EmailAddress email = new EmailAddress();
-        email.setAddress("public-user@localhost");
-        user.setPrimaryEmailAddress(email);
+        user.setPrimaryEmailAddress("public-user@localhost");
+        user.setPrimaryEmailAddressBouncing(false);
+        user.setPrimaryEmailAddressVerified(true);
 
         entityManager.persist(user);
     }
diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__emailaddress_embedded_to_json.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__emailaddress_embedded_to_json.sql
index 2269ba729..bb8dac6b6 100644
--- a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__emailaddress_embedded_to_json.sql
+++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__emailaddress_embedded_to_json.sql
@@ -1,10 +1,11 @@
-ALTER TABLE ccm_core.users ADD COLUMN primary_email_address JSONB NOT NULL;
+ALTER TABLE ccm_core.users ADD COLUMN primary_email_address varchar(255);
+ALTER TABLE ccm_core.users ADD COLUMN primary_email_address_bouncing boolean;
+ALTER TABLE ccm_core.users ADD COLUMN primary_email_address_verified boolean;
 ALTER TABLE ccm_core.users ADD COLUMN email_addresses JSONB;
 UPDATE ccm_core.users 
-    SET primary_email_address = JSONB_BUILD_OBJECT(
-        'address', email_address, 
-        'bouncing', bouncing,
-        'verified', verified
+    SET primary_email_address = email_address,
+        primary_email_address_bouncing = bouncing,
+        primary_email_address_verified = verified
     );
 DROP TABLE ccm_core.user_email_addresses;
 ALTER TABLE ccm_core.users DROP COLUMN email_address;
diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql
index cf7e53429..bfba70bef 100644
--- a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql
+++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql
@@ -447,12 +447,12 @@
         SETTING_ID int8 not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
+        SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_LONG int8,
         SETTING_VALUE_BOOLEAN boolean,
         SETTING_VALUE_DOUBLE float8,
-        SETTING_VALUE_LONG int8,
-        SETTING_VALUE_STRING varchar(1024),
-        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         SETTING_VALUE_LOCALIZED_STRING jsonb,
+        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         primary key (SETTING_ID)
     );
 
@@ -566,7 +566,9 @@
         GIVEN_NAME varchar(512),
         PASSWORD varchar(2048),
         PASSWORD_RESET_REQUIRED boolean,
-        PRIMARY_EMAIL_ADDRESS jsonb,
+        PRIMARY_EMAIL_ADDRESS varchar(255),
+        PRIMARY_EMAIL_ADDRESS_BOUNCING boolean,
+        PRIMARY_EMAIL_ADDRESS_VERIFIED boolean,
         PARTY_ID int8 not null,
         primary key (PARTY_ID)
     );
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml
index 416fd50a7..ed574ae6f 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml
@@ -84,13 +84,17 @@ ccm_core.users:
     - party_id: 3000
       given_name: public
       family_name: user
-      primary_email_address: "{\"address\": \"public-user@localhost\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: public-user@localhost
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       banned: false
       password_reset_required: false
     - party_id: 3100
       given_name: Jane
       family_name: Doe
-      primary_email_address: "{\"address\": \"jane.doe@localhost\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: jane.doe@localhost
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
@@ -98,7 +102,9 @@ ccm_core.users:
     - party_id: 3200
       given_name: Maria
       family_name: Muster
-      primary_email_address: "{\"address\": \"mmuster@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: mmuster@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml
index 07c3234df..3d2ef6285 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml
@@ -69,20 +69,26 @@ ccm_core.users:
     - party_id: 100
       given_name: public
       family_name: user
-      primary_email_address: "{\"address\": \"public-user@localhost\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: public-user@localhost
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       banned: false
       password_reset_required: false
     - party_id: 200
       given_name: John
       family_name: Doe
-      primary_email_address: "{\"address\": \"john.doe@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
       password_reset_required: false
     - party_id: 300
       given_name: Max
       family_name: Mustermann
-      primary_email_address: "{\"address\": \"mmuster@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: mmuster@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_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/categorization/CategoryRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml
index 1c261e559..be60d249c 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml
@@ -59,20 +59,26 @@ ccm_core.users:
     - party_id: 100
       given_name: public
       family_name: user
-      primary_email_address: "{\"address\": \"public-user@localhost\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: public-user@localhost
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       banned: false
       password_reset_required: false
     - party_id: 200
       given_name: John
       family_name: Doe
-      primary_email_address: "{\"address\": \"john.doe@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       banned: false
       password_reset_required: false
     - party_id: 300
       given_name: Max
       family_name: Mustermann
-      primary_email_address: "{\"address\": \"mmuster@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: mmuster@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_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-account-activation.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ChallengeManagerTest/after-create-account-activation.xml
index 6cad3de99..7efd85ced 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,18 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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 47cb4a2cb..cbf6d24b2 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,18 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
-                    password_reset_required="false"
-    />
+                    password_reset_required="false" />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"
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 93ca19679..88bc526ff 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
-                    password_reset_required="false"
-    />
+                    password_reset_required="false" />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"
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 cf667cf70..c6d993d80 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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": false}'
+                    primary_email_address="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
-                    password_reset_required="false"
-    />
+                    password_reset_required="false" />
 
 </dataset>
 
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 4f49898fd..a393947db 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
-                    password_reset_required="false"
-    />
+                    password_reset_required="false" />
 
 </dataset>
 
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 0b37907b5..0889e4567 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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": false}'
+                    primary_email_address="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    banned="true"
-                    password_reset_required="false"
-    />
+                    banned="false"
+                    password_reset_required="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 7b63e36c5..83fbb4718 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,18 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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 a38b3f417..257f640a7 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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": false}'
+                    primary_email_address="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    banned="true"
-                    password_reset_required="false"
-    />
+                    banned="false"
+                    password_reset_required="false" />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"
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 4b8c322ea..07a15f4e0 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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": false}'
+                    primary_email_address="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
                     banned="false"
-                    password_reset_required="false"
-    />
+                    password_reset_required="false" />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"
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 07d8eaee2..15f68ebac 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,19 +31,21 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
-                    password_reset_required="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": false}'
+                    primary_email_address="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q=="
-                    banned="true"
-                    password_reset_required="false"
-    />
+                    banned="false"
+                    password_reset_required="false" />
 
     <ccm_core.one_time_auth_tokens 
         token_id="-100"
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml
index 9f5e1531a..1bb9cf79d 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -44,7 +48,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml
index 50547a3ef..c5a232d84 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -44,12 +48,15 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
       password_reset_required: false
+
 ccm_core.groups:
     # admins
     - party_id: 40
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml
index eb67b5570..28cdb0f75 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -44,7 +48,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouning: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-create.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-create.xml
index 5f550adfd..212af772b 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-create.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-create.xml
@@ -31,7 +31,9 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +41,9 @@
     <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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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/OneTimeAuthManagerTest/after-invalidate.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-invalidate.xml
index b7de82721..30c5d4c0b 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-invalidate.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/after-invalidate.xml
@@ -31,7 +31,9 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +41,9 @@
     <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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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/OneTimeAuthManagerTest/data.xml b/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/data.xml
index 30eadf372..8812b0842 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/data.xml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/OneTimeAuthManagerTest/data.xml
@@ -31,7 +31,9 @@
     <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="john.doe@example.com"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_verified="true"
                     password="$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="
                     banned="false"
                     password_reset_required="false"
@@ -39,7 +41,9 @@
     <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="max.muster@example.org"
+                    primary_email_address_bouncing="false"
+                    primary_email_address_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/PartyRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml
index 2b129a2b6..135a163ed 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml
@@ -11,7 +11,9 @@ ccm_core.groups:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml
index 20dcef6af..eafd049aa 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml
@@ -18,7 +18,9 @@ ccm_core.groups:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -27,7 +29,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml
index 7e5de2dfa..10388d31f 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml
@@ -11,7 +11,9 @@ ccm_core.groups:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml
index eb0d1c8de..bd636aa75 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -44,7 +48,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml
index 6655180bf..4c0115a5c 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -44,7 +48,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml
index 63eaba993..5fdf9c42b 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -44,7 +48,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml
index 5bdb150c4..d13a25ef1 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml
@@ -26,7 +26,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 41001
@@ -35,7 +37,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 41002
@@ -44,7 +48,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 41003
@@ -52,14 +58,18 @@ ccm_core.users:
       password_reset_required: false
     # Public user
     - banned: false
-      primary_email_address: "{\"address\": \"public-user@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: public-user@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: user
       given_name: public
       party_id: 41004
       password_reset_required: false
     # Erik Mustermann (banned)
     - banned: true
-      primary_email_address: "{\"address\": \"erik.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: erik.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Musterman
       given_name: Erik
       party_id: 41005
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml
index f8103cecd..357632df3 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml
@@ -19,7 +19,9 @@ ccm_core.users:
     # John Doe
     - party_id: 10
       banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       # foo123
@@ -28,7 +30,9 @@ ccm_core.users:
     # Max Mustermann
     - party_id: 20
       banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       # foo123
@@ -37,7 +41,9 @@ ccm_core.users:
     # Joe Public
     - party_id: 30
       banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
@@ -45,7 +51,9 @@ ccm_core.users:
     # Jane Doe
     - party_id: 40
       banned: false
-      primary_email_address: "{\"address\": \"jane.doe@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: jane.doe@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: Jane
       password: $shiro1$SHA-512$500000$24lA090z7GKYr4VFlZ6t4A==$/heoTHPA5huT1UfJ8Q+waXEG6AjUKhFYLFrj7KW/l0/z9O+QkiZTtfPfbcPblgjcEvrROMEIoQY4Z65S7rFLQg==
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml
index 814b4dc5c..566d92ebb 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml
@@ -10,7 +10,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -19,7 +21,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml
index 115df134f..89a360863 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml
@@ -14,7 +14,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"jd@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: jd@example.com\"
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -23,7 +25,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
@@ -31,7 +35,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml
index af809fead..8d0beb848 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml
@@ -17,35 +17,42 @@ ccm_core.parties:
       name: jane
 ccm_core.users:
     # John Doe
-    - party_id: 10
-      banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+    - banned: false
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
+      party_id: 10
       # foo123
       password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
       password_reset_required: false
     # Max Mustermann
-    - party_id: 20
-      banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+    - banned: false
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
+      party_id: 20
       # foo123
       password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
       password_reset_required: false
     # Joe Public
-    - party_id: 30
-      banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}}"
+    - banned: false
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
+      party_id: 30
       password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
-      password_reset_required: false
-    # Jane Doe
+      password_reset_required: false    # Jane Doe
     - party_id: 40
       banned: false
-      primary_email_address: "{\"address\": \"jane.doe@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: jane.doe@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: Jane
       password: $shiro1$SHA-512$500000$24lA090z7GKYr4VFlZ6t4A==$/heoTHPA5huT1UfJ8Q+waXEG6AjUKhFYLFrj7KW/l0/z9O+QkiZTtfPfbcPblgjcEvrROMEIoQY4Z65S7rFLQg==
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml
index 422d41a31..f999cc8cd 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml
@@ -14,7 +14,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -23,7 +25,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -32,7 +36,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30
diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml
index da99f6106..f999cc8cd 100644
--- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml
@@ -14,7 +14,9 @@ ccm_core.parties:
 ccm_core.users:
     # John Doe
     - banned: false
-      primary_email_address: "{\"address\": \"john.doe@example.com\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: john.doe@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Doe
       given_name: John
       party_id: 10
@@ -23,7 +25,9 @@ ccm_core.users:
       password_reset_required: false
     # Max Mustermann
     - banned: false
-      primary_email_address: "{\"address\": \"max.mustermann@example.org\", \"bouncing\": false, \"verified\": true}"
+      primary_email_address: max.mustermann@example.org
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Mustermann
       given_name: Max
       party_id: 20
@@ -32,7 +36,9 @@ ccm_core.users:
       password_reset_required: false
     # Joe Public
     - banned: false
-      primary_email_address: "{\"address\": \"joe.public@example.com\", \"bouncing\": false, \"verified\": true}}"
+      primary_email_address: joe.public@example.com
+      primary_email_address_bouncing: false
+      primary_email_address_verified: true
       family_name: Public
       given_name: Joe
       party_id: 30