diff --git a/index.php b/index.php
index c9b6352..4cfbedc 100644
--- a/index.php
+++ b/index.php
@@ -244,14 +244,11 @@ $router->post('/manage/{uuid}', function ($uuid) {
     $guests = R::findAll('guests', ' id IN(' . R::genSlots($_POST['guestsArray']) . ') AND order_id = ?', $parametersToSearch);
 
     foreach ($guests as $id => $guest) {
-        if (!empty($_POST['guests'][$id]['name']) &&
-            !empty($_POST['guests'][$id]['email']) &&
-            !empty($_POST['guests'][$id]['phone'])) {
+        if (isset($_POST['guests'][$id]['name'])) {
             $guest->name = $_POST['guests'][$id]['name'];
             $guest->email = $_POST['guests'][$id]['email'];
             $guest->phone = $_POST['guests'][$id]['phone'];
             $guest->childcare = $_POST['guests'][$id]['childcare'];
-            $guest->valet = $_POST['guests'][$id]['valet'];
             $guest->restrictions = $_POST['guests'][$id]['restrictions'];
             R::store($guest);
         }
diff --git a/views/guestlist.php b/views/guestlist.php
index ba59334..7b32ab9 100644
--- a/views/guestlist.php
+++ b/views/guestlist.php
@@ -16,32 +16,32 @@ if (isset($_GET['alert']) && $_GET['alert'] == 'success') { ?>
         foreach ($guests as $guest) {
             $i++;
         ?>
-        <input type="hidden" name="guests[<?=$i?>][id]" value="<?=$guest->id;?>" >
+        <input type="hidden" name="guests[<?=$guest->id?>][id]" value="<?=$guest->id;?>" >
         <input type="hidden" name="guestsArray[]" value="<?=$guest->id;?>" >
         <h5 class="mb-3">Guest #<?=$i?> <small><?=(is_null($guest->table)) ? '' : 'Table #' . $guest->table; ?><?=(is_null($guest->paddle)) ? '' : ', Paddle #' . $guest->paddle; ?></small></h5>
             <div class="row">
                 <div class="col-md-2 mb-3">
                     <label for="name">Full name</label>
-                    <input name="guests[<?=$i?>][name]" type="text" class="form-control" id="name" value="<?=$guest->name?>">
+                    <input name="guests[<?=$guest->id?>][name]" type="text" class="form-control" id="name" value="<?=$guest->name?>">
                 </div>
                 <div class="col-md-2 mb-3">
                     <label for="lastName">Email</label>
-                    <input name="guests[<?=$i?>][email]" type="text" class="form-control" id="email" value="<?=$guest->email?>">
+                    <input name="guests[<?=$guest->id?>][email]" type="text" class="form-control" id="email" value="<?=$guest->email?>">
                 </div>
                 <div class="col-md-2 mb-3">
                     <label for="lastName">Phone</label>
-                    <input name="guests[<?=$i?>][phone]" type="text" class="form-control" id="phone" value="<?=$guest->phone?>">
+                    <input name="guests[<?=$guest->id?>][phone]" type="text" class="form-control" id="phone" value="<?=$guest->phone?>">
                 </div>
                 <div class="col-md-2 mb-3">
                     <label for="childcare">Childcare?</label>
-                    <select class="form-control" name="guests[<?=$i?>][childcare]">
+                    <select class="form-control" name="guests[<?=$guest->id?>][childcare]">
                         <option value="0" <?php if (false == $guest->childcare) { echo 'selected'; } ?>>No</option>
                         <option value="1" <?php if (true == $guest->childcare) { echo 'selected'; } ?>>Yes</option>
                     </select>
                 </div>
                 <div class="col-md-4 mb-3">
                     <label for="restrictions">Food preferences?</label>
-                    <select class="form-control" name="guests[<?=$i?>][restrictions]">
+                    <select class="form-control" name="guests[<?=$guest->id?>][restrictions]">
                         <option value="0" <?php if (0 == $guest->restrictions) { echo 'selected'; } ?>>None</option>
                         <option value="1" <?php if (1 == $guest->restrictions) { echo 'selected'; } ?>>Vegetarian</option>
                         <option value="2" <?php if (2 == $guest->restrictions) { echo 'selected'; } ?>>Vegan</option>