diff --git a/regapp-idty/src/main/java/edu/kit/scc/webreg/service/identity/IdentityEmailAddressHandler.java b/regapp-idty/src/main/java/edu/kit/scc/webreg/service/identity/IdentityEmailAddressHandler.java
index cd0e39294c1981aca2897cf53ec3f0232c03ab0f..db0ed98fd472b1c0eeeb8d4550861cbe4ab1a050 100644
--- a/regapp-idty/src/main/java/edu/kit/scc/webreg/service/identity/IdentityEmailAddressHandler.java
+++ b/regapp-idty/src/main/java/edu/kit/scc/webreg/service/identity/IdentityEmailAddressHandler.java
@@ -80,6 +80,10 @@ public class IdentityEmailAddressHandler implements Serializable {
 		entity.setEmailStatus(EmailAddressStatus.FROM_ATTRIBUTE_UNVERIFIED);
 		entity = dao.persist(entity);
 
+		if (identity.getPrimaryEmail() == null) {
+			identity.setPrimaryEmail(entity);
+		}
+
 		return entity;
 		
 	}