diff --git a/bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEntity.java b/bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEntity.java
index cc110875152660df1fffdb988f5d2fa8583a51fe..dde131ea81403b76c86318bfe3389ffcbd0e5215 100644
--- a/bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEntity.java
+++ b/bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEntity.java
@@ -12,7 +12,6 @@ package edu.kit.scc.webreg.entity.identity;
 
 import java.util.Set;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -35,8 +34,7 @@ public class IdentityEntity extends AbstractBaseEntity {
 	@Column(name="twofa_user_name", length=512)
 	private String twoFaUserName;
 
-	@OneToMany(targetEntity=UserEntity.class, mappedBy = "identity",
-			cascade = CascadeType.ALL)
+	@OneToMany(targetEntity=UserEntity.class, mappedBy = "identity")
 	private Set<UserEntity> users;
 
 	@OneToMany(targetEntity=IdentityUserPreferenceEntity.class, mappedBy = "identity")
diff --git a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/identity/IdentityServiceImpl.java b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/identity/IdentityServiceImpl.java
index cb1f5bbeaff6a2d1c84d07c2b760f0b9d9719880..874019379633e84cf56c613bf2eb2d077cafee97 100644
--- a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/identity/IdentityServiceImpl.java
+++ b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/identity/IdentityServiceImpl.java
@@ -91,6 +91,8 @@ public class IdentityServiceImpl extends BaseServiceImpl<IdentityEntity, Long> i
 						id.setTwoFaUserName(user.getEppn());
 					else
 						id.setTwoFaUserName(UUID.randomUUID().toString());
+
+					logger.info("Add missing 2fa userId {} and 2fa username {}", id.getTwoFaUserId(), id.getTwoFaUserName());
 				}
 			}
 			else {
diff --git a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserDeleteServiceImpl.java b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserDeleteServiceImpl.java
index 6ec7264bd946c8b5240095b69ebdf91a5ed1f0b8..c095ddb83afa07c676bd1ecf4e66ea60b151c9d2 100644
--- a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserDeleteServiceImpl.java
+++ b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserDeleteServiceImpl.java
@@ -86,7 +86,9 @@ public class UserDeleteServiceImpl implements UserDeleteService {
 		logger.info("Delete all personal user data for identity {}", identity.getId());
 		identity = identityDao.merge(identity);
 		
-		for (UserEntity user : identity.getUsers()) {
+		List<UserEntity> userList = userDao.findByIdentity(identity);
+		
+		for (UserEntity user : userList) {
 			logger.info("Delete all personal user data for user {}", user.getId());
 
 			UserDeleteAuditor auditor = new UserDeleteAuditor(auditEntryDao, auditDetailDao, appConfig);