diff --git a/components/partials/date-element.php b/components/partials/date-element.php
index 1ef6425..38e5d89 100644
--- a/components/partials/date-element.php
+++ b/components/partials/date-element.php
@@ -1,6 +1,6 @@
 <?php
 function _kompass_print_datebox($settingName, $settingValue, $style = '') {
-    echo '<input style="' . $style . '" type="date" name="' . $settingName . '" value="' . $settingValue. '" />';
+    echo '<input required style="' . $style . '" type="date" name="' . $settingName . '" value="' . $settingValue. '" />';
     if (defined('WP_DEBUG') && WP_DEBUG == true) {
         echo '<br />' . $settingName;
     }
diff --git a/components/partials/text-element.php b/components/partials/text-element.php
index 3aaebe2..5208401 100644
--- a/components/partials/text-element.php
+++ b/components/partials/text-element.php
@@ -1,9 +1,9 @@
 <?php
 function _kompass_print_textbox($settingName, $settingValue, $style = '', $appendix = '', $lines = 1, $data_type = 'text') {
     if (1 === $lines) {
-        echo '<input style="' . $style . '" type="' . $data_type . '" name="' . $settingName . '" value="' . $settingValue . '" />';
+        echo '<input required style="' . $style . '" type="' . $data_type . '" name="' . $settingName . '" value="' . $settingValue . '" />';
     } else {
-        echo '<textarea style="' . $style . '" name="' . $settingName . '" rows=' . $lines . '>' . $settingValue . '</textarea>';
+        echo '<textarea required style="' . $style . '" name="' . $settingName . '" rows=' . $lines . '>' . $settingValue . '</textarea>';
     }
     if (null !== $appendix) {
         echo '&nbsp;' . $appendix;
diff --git a/modules/event-participants/Templates/Partials/Registration/kontaktdaten.php b/modules/event-participants/Templates/Partials/Registration/kontaktdaten.php
index e1898b8..5f1c925 100644
--- a/modules/event-participants/Templates/Partials/Registration/kontaktdaten.php
+++ b/modules/event-participants/Templates/Partials/Registration/kontaktdaten.php
@@ -18,11 +18,7 @@
 		<td>Stamm / ABG:</td>
 		<td>
 			<select name="stamm" required placeholder="Bitte wählen">
-                <option value="ANC">Ancalagon</option>
-                <option value="BAN">Bankiva</option>
-				<option value="FEU">Feuerland</option>
-				<option value="LEO">LEO</option>
-				<option value="WM">Wilde Möhre</option>
+                {{beteiligte_gruppen}}
 			</select>
 		</td>
 	</tr>
diff --git a/modules/event-participants/Views/events-registration-form.php b/modules/event-participants/Views/events-registration-form.php
index d5a9fba..26c34c9 100644
--- a/modules/event-participants/Views/events-registration-form.php
+++ b/modules/event-participants/Views/events-registration-form.php
@@ -62,11 +62,19 @@ function registrationForm(int $eventId, string $targetPage) : string
 		$registerForm
 	);
 
+    $tribes_array = unserialize($event->contributing_tribes);
+    $tribes = '';
+    foreach ($tribes_array as $tribe) {
+        $tribes .= '<option value="' . $tribe . '">' . $tribe . '</option>';
+    }
+
+
 	$registerForm = str_replace('{{startdate}}', $event->startdatum, $registerForm);
 	$registerForm = str_replace('{{enddate}}', $event->enddatum, $registerForm);
 	$registerForm = str_replace('{{amount_reduced}}', $event->amount_reduced, $registerForm);
 	$registerForm = str_replace('{{amount_default}}', $event->amount_default, $registerForm);
 	$registerForm = str_replace('{{amount_social}}', $event->amount_social, $registerForm);
+    $registerForm = str_replace('{{beteiligte_gruppen}}', $tribes, $registerForm);
 
 
 	$registerForm = str_replace('{{URL}}', $targetPage, $registerForm);