diff --git a/src/plainui/jinja2/plainui/event.html.j2 b/src/plainui/jinja2/plainui/event.html.j2
index 007c0e88b23f22b87813a17402a7cfc8006562ec..3ab6d9958d29763acd5592a8ccbebbc4737f1dac 100644
--- a/src/plainui/jinja2/plainui/event.html.j2
+++ b/src/plainui/jinja2/plainui/event.html.j2
@@ -106,17 +106,23 @@
               <div class="hub-tags">
                 {{ eventMacro.recorded_tag(event.is_recorded) }}
 
-                {% if assembly.is_official %}
+                {% if event.kind == event.Kind.OFFICIAL %}
                   {{ tagboxMacro.tag(_("Event__official") ,
                   style='secondary',
                   icon='star-fill',
                   title=_('Event__official__help')
                   ) }}
-                {% elif event.kind != 'official' %}
-                  {{ tagboxMacro.tag(_("Self-organized Session") if event.kind == 'sos' else _("Assembly-Event"),
+                {% elif event.kind == event.Kind.ASSEMBLY %}
+                  {{ tagboxMacro.tag(_("Assembly-Event") ,
                   style='secondary',
-                  icon='person-video3' if event.kind == 'sos' else 'person-arms-up',
-                  title=_('Event__sos__help') if event.kind == 'sos' else _('Event__assembly__help'),
+                  icon='person-arms-up',
+                  title=_('Event__assembly__help'),
+                  ) }}
+                {% elif event.kind == event.Kind.SELF_ORGANIZED %}
+                  {{ tagboxMacro.tag(_("Self-organized Session") ,
+                  style='secondary',
+                  icon='person-video3',
+                  title=_('Event__sos__help'),
                   ) }}
                 {% endif %}
 
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index 35d730781c04018e54b1a1f5bcd130b5b8894f47..adcb3ec55bb85289144e928172670fffb1931bd6 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -976,12 +976,12 @@ msgstr "offiziell"
 msgid "Event__official__help"
 msgstr "Offizielle Veranstaltung werden vom Veranstalter kuratiert."
 
-msgid "Event__sos__help"
-msgstr "Selbst organisierte Sessions werden durch Einzelpersonen veranstaltet."
-
 msgid "Event__assembly__help"
 msgstr "Assembly-Veranstaltungen werden von einer Assembly - einer vorangemeldeten Gruppe an Teilnehmenden - veranstaltet."
 
+msgid "Event__sos__help"
+msgstr "Selbst organisierte Sessions werden durch Einzelpersonen veranstaltet."
+
 msgid "Fahrplan"
 msgstr "Schedule"
 
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index 6b86437423b12a62be2465a87ddbec906d2637cb..445ff7ae18144d06a2b93c65cc8c48e62f3d4e67 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -976,12 +976,12 @@ msgstr "official"
 msgid "Event__official__help"
 msgstr "Official events are curated by the organizer."
 
-msgid "Event__sos__help"
-msgstr "Self-organized sessions are organized by individuals."
-
 msgid "Event__assembly__help"
 msgstr "Assembly events are organizeed by an assembly - a pre-registered group of participants."
 
+msgid "Event__sos__help"
+msgstr "Self-organized sessions are organized by individuals."
+
 msgid "Fahrplan"
 msgstr "Schedule"