diff --git a/src/main/java/com/sasiedzi/event/domain/Event.java b/src/main/java/com/sasiedzi/event/domain/Event.java
index 2a6083d..f93f04b 100644
--- a/src/main/java/com/sasiedzi/event/domain/Event.java
+++ b/src/main/java/com/sasiedzi/event/domain/Event.java
@@ -39,11 +39,11 @@ public class Event implements Serializable {
     @Column(name = "cost", precision = 21, scale = 2)
     private BigDecimal cost;
 
-    @Lob
+    //    @Lob
     @Column(name = "comment")
     private String comment;
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "event")
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "event")
     @JsonIgnoreProperties(value = { "user", "event" }, allowSetters = true)
     private Set<Registration> registrations = new HashSet<>();
 
diff --git a/src/main/java/com/sasiedzi/event/domain/Registration.java b/src/main/java/com/sasiedzi/event/domain/Registration.java
index 70aa207..75c94a1 100644
--- a/src/main/java/com/sasiedzi/event/domain/Registration.java
+++ b/src/main/java/com/sasiedzi/event/domain/Registration.java
@@ -33,7 +33,7 @@ public class Registration implements Serializable {
     @Column(name = "player_name")
     private String playerName;
 
-    @Lob
+    //    @Lob
     @Column(name = "comment")
     private String comment;
 
diff --git a/src/main/webapp/app/entities/event/event-details.vue b/src/main/webapp/app/entities/event/event-details.vue
index 33f015f..e361043 100644
--- a/src/main/webapp/app/entities/event/event-details.vue
+++ b/src/main/webapp/app/entities/event/event-details.vue
@@ -35,6 +35,21 @@
             <span>{{ event.comment }}</span>
           </dd>
         </dl>
+        <!-- Dodajemy sekcję dla rejestracji -->
+        <h3>Rejestracje</h3>
+        <ul>
+          <li v-for="registration in event.registrations" :key="registration.id">
+            {{ registration.playerName }}
+            <!-- lub inne pola, które chcesz pokazać -->
+          </li>
+        </ul>
+
+        <router-link :to="{ name: 'RegistrationCreateForEvent', params: { eventId: event.id } }" custom v-slot="{ navigate }">
+          <button @click="navigate" class="btn btn-primary">
+            <font-awesome-icon icon="plus"></font-awesome-icon>&nbsp;<span>Dodaj Rejestrację</span>
+          </button>
+        </router-link>
+
         <button type="submit" @click.prevent="previousState()" class="btn btn-info" data-cy="entityDetailsBackButton">
           <font-awesome-icon icon="arrow-left"></font-awesome-icon>&nbsp;<span>Back</span>
         </button>
diff --git a/src/main/webapp/app/entities/registration/registration-update.vue b/src/main/webapp/app/entities/registration/registration-update.vue
index 8877b6d..a57cbac 100644
--- a/src/main/webapp/app/entities/registration/registration-update.vue
+++ b/src/main/webapp/app/entities/registration/registration-update.vue
@@ -84,11 +84,12 @@
           <div class="form-group">
             <label class="form-control-label" for="registration-event">Event</label>
             <select class="form-control" id="registration-event" data-cy="event" name="event" v-model="registration.event">
-              <option :value="null"></option>
+              <option :value="null">Please select an event</option>
               <option
-                :value="registration.event && eventOption.id === registration.event.id ? registration.event : eventOption"
+                :value="eventOption.id === eventId ? eventOption : registration.event"
                 v-for="eventOption in events"
                 :key="eventOption.id"
+                :selected="eventOption.id === eventId"
               >
                 {{ eventOption.name }}
               </option>
diff --git a/src/main/webapp/app/router/entities.ts b/src/main/webapp/app/router/entities.ts
index 7bc13ad..7853df9 100644
--- a/src/main/webapp/app/router/entities.ts
+++ b/src/main/webapp/app/router/entities.ts
@@ -76,10 +76,11 @@ export default {
       meta: { authorities: [Authority.USER] },
     },
     {
-      path: 'registration/new',
-      name: 'RegistrationCreate',
+      path: 'registration/new/:eventId?',
+      name: 'RegistrationCreateForEvent',
       component: RegistrationUpdate,
       meta: { authorities: [Authority.USER] },
+      props: true,
     },
     {
       path: 'registration/:registrationId/edit',
diff --git a/src/main/webapp/app/shared/model/event.model.ts b/src/main/webapp/app/shared/model/event.model.ts
index 0059d6f..ba81916 100644
--- a/src/main/webapp/app/shared/model/event.model.ts
+++ b/src/main/webapp/app/shared/model/event.model.ts
@@ -1,3 +1,5 @@
+import type { IRegistration } from '@/shared/model/registration.model';
+
 export interface IEvent {
   id?: number;
   name?: string;
@@ -5,6 +7,7 @@ export interface IEvent {
   playersLimit?: number | null;
   cost?: number | null;
   comment?: string | null;
+  registrations?: IRegistration[];
 }
 
 export class Event implements IEvent {
@@ -15,5 +18,6 @@ export class Event implements IEvent {
     public playersLimit?: number | null,
     public cost?: number | null,
     public comment?: string | null,
+    public registrations?: IRegistration[],
   ) {}
 }