diff --git a/aleksis/apps/paweljong/models.py b/aleksis/apps/paweljong/models.py
index c006ff0791e72024a9552c1317f8e8eb4eb2a60f..1b928dffcac255d4771c223e23fbf4e6ef109a01 100644
--- a/aleksis/apps/paweljong/models.py
+++ b/aleksis/apps/paweljong/models.py
@@ -6,10 +6,9 @@ from aleksis.core.models import Group
 
 class Event(ExtensibleModel):
     # Event details
-    display_name = models.CharField(verbose_name=_("Display name"), max_length=255, default="")
-    short_name = models.CharField(verbose_name=_("Short name"), max_length=255, default="")
-    group = models.ForeignKey(
-        Group, on_delete=models.CASCADE, verbose_name=_("Group"), related_name="event"
+    display_name = models.CharField(verbose_name=_("Display name"), max_length=255)
+    linked_group = models.OneToOneField(
+        Group, on_delete=models.CASCADE, verbose_name=_("Group"), related_name="linked_event"
     )
     description = models.CharField(max_length=500, verbose_name=_("Description"))
     published = models.BooleanField(default=False, verbose_name=_("Publish"))
@@ -22,4 +21,4 @@ class Event(ExtensibleModel):
 
     # Other details
     cost = models.IntegerField(verbose_name=_("Cost in €"))
-    max_participants = models.IntegerField(verbose_name=_("Max participants"))
+    max_participants = models.PositiveSmallIntegerField(verbose_name=_("Maximum participants"))