diff --git a/src/main/java/com/sasiedzi/event/domain/UserAccount.java b/src/main/java/com/sasiedzi/event/domain/UserAccount.java
index 46e6df2..780442f 100644
--- a/src/main/java/com/sasiedzi/event/domain/UserAccount.java
+++ b/src/main/java/com/sasiedzi/event/domain/UserAccount.java
@@ -25,7 +25,7 @@ public class UserAccount implements Serializable {
     @Column(name = "name")
     private String name;
 
-    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @ManyToMany(fetch = FetchType.EAGER)
     @JoinTable(
         name = "rel_user_account__user",
         joinColumns = @JoinColumn(name = "user_account_id"),
diff --git a/src/main/java/com/sasiedzi/event/service/EventService.java b/src/main/java/com/sasiedzi/event/service/EventService.java
index 9b7f833..9da692f 100644
--- a/src/main/java/com/sasiedzi/event/service/EventService.java
+++ b/src/main/java/com/sasiedzi/event/service/EventService.java
@@ -190,6 +190,7 @@ public class EventService {
                         userAccount.setName(registration.getUser().getName());
                         userAccount.getUsers().add(registration.getUser());
                         userAccount = userAccountRepository.save(userAccount);
+                        accountsByLogin.put(login, userAccount);
                     }
                     accountsToCharge.add(userAccount);
                 });