diff --git a/templates/mail_confirmed.htm b/templates/mail_confirmed.htm
index c01da31..6057d6e 100644
--- a/templates/mail_confirmed.htm
+++ b/templates/mail_confirmed.htm
@@ -1,5 +1,10 @@
 <div class="alert alert-success" role="alert">
     <p>Your email address was confirmed! Thank you for registering for
-        <?php echo $SERVICE_ACRONYM; if(!empty($REDIRECT_TO) ) { echo "</p><p>You are being redirected..."; } ?>
+        <?php 
+        echo $SERVICE_ACRONYM ."!";
+        if ($CONFERENCE_REGISTRATION) {
+            echo " A confirmation email including the invoice and payment instructions has been sent to you.";
+        }
+        if(!empty($REDIRECT_TO) ) { echo "</p><p>You are being redirected..."; } ?>
     </p>
 </div>
diff --git a/templates/register.htm b/templates/register.htm
index cf63cce..8ea509c 100644
--- a/templates/register.htm
+++ b/templates/register.htm
@@ -481,7 +481,7 @@
     <?php endif; ?>
      <?php if( $CONFERENCE_REGISTRATION ): ?>
      <div class="form-outline col-md-7">
-        <label class="form-label fw-bold" for="student">Author Status</label>
+        <label class="form-label fw-bold" for="author">Author Status</label>
         <div class="form-group form-check">
             <input type="checkbox" class="form-check-input" name="author" id="author"
                 <?php echo isset($_POST['author']) ? 'checked' : '' ?>
@@ -493,7 +493,7 @@
     </div>
 
     <div class="form-outline col-md-5">
-        <label class="form-label fw-bold" for="student">Paper ID</label>
+        <label class="form-label fw-bold" for="paper_id">Paper ID</label>
         <input type="text" class="form-control fs-4" name="accepted_paper_id" id="paper_id"
             <?php echo isset($_POST['author']) ? 'placeholder="0000"' : 'disabled' ?>
             value="<?php echo isset($_POST['paper_id']) ? htmlspecialchars($_POST['paper_id']) : '' ?>" />
@@ -511,10 +511,14 @@
                 value="participation_confirmed">
             <label class="form-check-label fs-4" for="participation_confirmed">I confirm that I will be attending the <?php echo $SERVICE_ACRONYM; ?> conference. 
                 <?php if(new DateTimeImmutable("now") <= new DateTimeImmutable($EARLYBIRD_DEADLINE." 23:59:59 HST")) {
-                    echo "The early bird conference fee of <strong>€ <span id='conference_fee'>". $EARLYBIRD_CONFERENCE_FEE."</span></strong> is still valid until ".$EARLYBIRD_DEADLINE.".
+                        echo "The early bird conference fee of <strong>€ <span id='conference_fee'>". $EARLYBIRD_CONFERENCE_FEE."</span></strong> is still valid until ".$EARLYBIRD_DEADLINE.".
                      (afterwards the fee fee will be € <span id='conference_fee'>". $REGULAR_CONFERENCE_FEE.")";
+                        echo '<input type="hidden" name="conference_fee" value="' . $EARLYBIRD_CONFERENCE_FEE . '">';
+                        echo '<input type="hidden" name="earlybird_registration" value="earlybird_registration">';
                     } else {
                         echo "The conference fee is <strong>€ <span id='conference_fee'>". $REGULAR_CONFERENCE_FEE."</span></strong>.";
+                        echo '<input type="hidden" name="conference_fee" value="' . $REGULAR_CONFERENCE_FEE . '">';
+                        echo '<input type="hidden" name="earlybird_registration" value="">';
                     } ?>
             </label>
             <div class="invalid-feedback">
@@ -531,7 +535,7 @@
                 <?php echo isset($_POST['student']) ? 'checked' : '' ?>
                 oninput="update_total_due()"
                 value="student">
-            <label class="form-check-label fs-4" for="student">I am student and will therefore benefit from student discount of <strong>€ <span id="student_discount"><?php echo $STUDENT_DISCOUNT; ?></span></strong>.
+            <label class="form-check-label fs-4" for="student">I am student and will therefore benefit from student discount of <strong>€&nbsp;<span id="student_discount"><?php echo $STUDENT_DISCOUNT; ?></span></strong>.
             </label>
         </div>
     </div>
@@ -543,7 +547,7 @@
                 <?php echo isset($_POST['conference_dinner']) ? 'checked' : '' ?>
                 oninput="update_total_due()"
                 value="conference_dinner">
-            <label class="form-check-label fs-4" for="conference_dinner">I will be attending the conference dinner on 20 July at 8pm at the Rheinterrassen for the price of <strong>€ <span id="conference_dinner_price"><?php echo $CONFERENCE_DINNER; ?></span></strong>.
+            <label class="form-check-label fs-4" for="conference_dinner">I will be attending the conference dinner on 20 July at 8pm at the Rheinterrassen for the price of <strong>€&#160;<span id="conference_dinner_price"><?php echo $CONFERENCE_DINNER; ?></span></strong>.
             </label>
         </div>
     </div>
@@ -553,7 +557,7 @@
               <div class="input-group-text fs-3">€</div>
               <input lang="en" name="total_due" id="total_due" class="form-control text-end fw-bold fs-3" readonly>
             </div>
-            <div id="totalHelp" class="form-text fs-4">Only bank transfer is available as a payment method. After submitting the form, you will be asked to confirm your e-mail address. After you have confirmed it, you will receive an invoice with all bank details.</div>
+            <div id="totalHelp" class="form-text fs-4">Please note that bank transfer is the only payment method. After submitting this form, you will be asked to confirm your email address. After that you will receive an invoice with all bank details.</div>
     </div>
 
     <?php endif; ?>