diff --git a/create_user_table.sql b/create_user_table.sql
index daa42d6..b9c59a4 100644
--- a/create_user_table.sql
+++ b/create_user_table.sql
@@ -21,10 +21,10 @@
     earlybird_registration boolean not null default false,
     student boolean not null default false,
     conference_dinner boolean not null default false,
-    lunch_day_1 varchar(16) not null default '',
-    lunch_day_2 varchar(16) not null default '',
-    lunch_day_3 varchar(16) not null default '',
     vegetarian_dinner boolean,
+    lunch_day_1 varchar(32) not null default '',
+    lunch_day_2 varchar(32) not null default '',
+    lunch_day_3 varchar(32) not null default '',
     total_due decimal(10,2) not null default 0.00,
     registered_at timestamp default '0000-00-00 00:00:00', 
     updated_at timestamp default now() on update now(),
diff --git a/templates/register.htm b/templates/register.htm
index c35dcf4..597d67a 100644
--- a/templates/register.htm
+++ b/templates/register.htm
@@ -504,69 +504,87 @@
         </div>
     </div>
 
-    <label class="form-label fw-bold" for="participate">Lunch Options</label>
-    <div id="lunchHelp " class="form-text fs-4 ">You can optionally pre-order a small lunch for <strong>€ <span id="lunch_costs"><?php echo number_format($LUNCH,2); ?></span></strong> each including a drink. Alternatively, you can choose one of the <a href="https://www.google.de/maps/search/Universität+Mannheim,+Mannheim+restaurants/@49.4832116,8.458566,16z/data=!3m1!4b1">many restaurants nearby</a>.
-        The food is packed in a way that is easy to transport, so that you can easily take it into town or to the green spaces behind the University on the banks of the Rhine.</div>
+    <label class="form-label fw-bold" for="lunch-1 lunch-2 lunch-3">Lunch Options</label>
+    <div id="lunchHelp " class="form-text fs-4 ">
+        <p>You can optionally pre-order a small lunch for <strong>€&thinsp;<span id="lunch_costs"><?php echo number_format($LUNCH,2); ?></span></strong> each including a drink (0.5&thinsp;l PET Cola Mix, apple juice or water). The food is packed in a way
+            that is easy to transport, so that you can easily take it into town or to the green spaces behind the University on the banks of the Rhine.
+        </p>
+        <p>
+            Alternatively, you can choose one of the <a href="https://www.google.de/maps/search/Universität+Mannheim,+Mannheim+restaurants/@49.4832116,8.458566,16z/data=!3m1!4b1">many restaurants nearby</a>.
+        </p>
+    </div>
     <div id="lunch-1" class="form-outline col-md-4">
         <label class="form-label" for="pw2">Wednesday, 19 July</label>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1" value="--" checked>
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1" value="--" <?php if (!isset($_POST[ 'lunch_day_1']) || $_POST[ 'lunch_day_1']=="--" ) echo 'checked'; ?> >
             <label class="form-check-label" for="lunch_day_1">
               --
             </label>
         </div>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1a" value="non-vegetarian">
-            <label class="form-check-label" for="lunch_day_1a">
-              non-vegetarian
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1a" <?php if ($_POST['lunch_day_1']=="Avocado Bowl" ) echo 'checked'; ?> value="Avocado Bowl">
+            <label class="form-check-label" for="lunch_day_1a" data-bs-toggle="tooltip" title="avocado, beluga lentils, sweet potatoes, baby spinach, chickpeas, cilantro, yuzu dressing, mixed nuts">
+                Avocado Bowl <small>(vegan, gluten-free)</small>
             </label>
         </div>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1b" value="vegan">
-            <label class="form-check-label" for="lunch_day_1b">
-              vegan
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1b" <?php if ($_POST['lunch_day_1']=="Thai Rice Bowl" ) echo 'checked'; ?> value="Thai Rice Bowl">
+            <label class="form-check-label" for="lunch_day_1b" data-bs-toggle="tooltip" title="red Thai curry, rice, snow peas, roasted peppers, red cabbage, peanuts, roasted onions, cilantro">
+                Thai Rice Bowl <small>(vegan)</small>
+            </label>
+        </div>
+        <div class="form-check">
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_1" id="lunch_day_1c" <?php if ($_POST['lunch_day_1']=="Udon Noodle Bowl" ) echo 'checked'; ?> value="Udon Noodle Bowl">
+            <label class="form-check-label" for="lunch_day_1c" data-bs-toggle="tooltip" title="udon noodles, peanut sauce, sautéed vegetables, sweet potatoes, cilantro, chicken breast">
+            Udon Noodle Bowl   
             </label>
         </div>
     </div>
     <div id="lunch-2" class="form-outline col-md-4">
         <label class="form-label" for="pw2">Thursday, 20 July</label>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2" value="--" checked>
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2" value="--" <?php if (!isset($_POST[ 'lunch_day_2']) || $_POST[ 'lunch_day_2']=="--" ) echo 'checked'; ?> >
             <label class="form-check-label" for="lunch_day_2">
               --
             </label>
         </div>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2a" value="non-vegetarian">
-            <label class="form-check-label" for="lunch_day_2a">
-              non-vegetarian
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2a" <?php if ($_POST['lunch_day_2']=="New Oriental Bowl" ) echo 'checked'; ?>  value="New Oriental Bowl">
+            <label class="form-check-label" for="lunch_day_2a" data-bs-toggle="tooltip" title="beetroot hummus, cumin cauliflower, chickpeas, pomegranate, baby spinach, red cabbage, cilantro falafel, tahini dressing">
+                New Oriental Bowl <small>(vegan)</small>
             </label>
         </div>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2b" value="vegan">
-            <label class="form-check-label" for="lunch_day_2b">
-              vegan
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2b" <?php if ($_POST['lunch_day_2']=="Vegetarian Lasagne" ) echo 'checked'; ?> value="Vegetarian Lasagne">
+            <label class="form-check-label" for="lunch_day_2b" data-bs-toggle="tooltip" title="with fennel leek">
+              Lasagne <small>(vegetarian)</small>
+            </label>
+        </div>
+        <div class="form-check">
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_2" id="lunch_day_2b" <?php if ($_POST['lunch_day_2']=="Lasagne" ) echo 'checked'; ?> value="Lasagne">
+            <label class="form-check-label" for="lunch_day_2b" data-bs-toggle="tooltip" title="with beef">
+              Lasagne
             </label>
         </div>
     </div>
     <div id="lunch-3" class="form-outline col-md-4">
         <label class="form-label" for="pw2">Friday, 21 July</label>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_3" id="lunch_day_3a" value="--" checked>
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_3" id="lunch_day_3a" value="--"  <?php if (!isset($_POST[ 'lunch_day_3']) || $_POST[ 'lunch_day_3']=="--" ) echo 'checked'; ?> >
             <label class="form-check-label" for="lunch_day_3a">
               --
             </label>
         </div>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_3" id="lunch_day_3b" value="non-vegetarian">
-            <label class="form-check-label" for="lunch_day_3b">
-              non-vegetarian
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_3" id="lunch_day_3b" <?php if ($_POST['lunch_day_2']=="Tofu Teriyaki Bowl" ) echo 'checked'; ?>  value="Tofu Teriyaki Bowl">
+            <label class="form-check-label" for="lunch_day_3b" data-bs-toggle="tooltip" title="Udon noodles, raw vegetable salad, roasted peanuts, tofu, sesame, coriander, teriyaki dressing">
+                Tofu Teriyaki Bowl <small>(vegan, gluten-free)</small>
             </label>
         </div>
         <div class="form-check">
-            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_3" id="lunch_day_3c" value="vegan">
-            <label class="form-check-label" for="lunch_day_3c">
-              vegan
+            <input class="form-check-input" oninput="update_total_due()" type="radio" name="lunch_day_3" id="lunch_day_3c"  <?php if ($_POST['lunch_day_2']=="Salamango Bowl" ) echo 'checked'; ?> value="Salamango Bowl">
+            <label class="form-check-label" for="lunch_day_3c" data-bs-toggle="tooltip" title="smoked salmon, avocado, edamame-pea mix, mango, marinated cucumber, soy-ginger dressing, wasabi mayo">
+                Salamango Bowl <small>(fish, gluten-free)</small>
             </label>
         </div>
     </div>