diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
index 38d7b3fa..5562c543 100644
--- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
+++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
@@ -126,7 +126,7 @@
                 <div class="modal-body">
                     <div class="input-group mb-3">
                         <span class="input-group-text">E-Mail</span>
-                        <input type="text" class="form-control email-input" placeholder="user@samplemail.com" id="readonly-receiver-mail" aria-label="">
+                        <input type="text" class="form-control email-input" placeholder="user@mail.com" id="readonly-receiver-mail" aria-label="">
                     </div>
                     <div class="input-group">
                         <span class="input-group-text">Gültig bis</span>
@@ -160,7 +160,7 @@
         const dateValid_value = dateValid.value;
     
         //check email
-            if (receiverMail.classList.contains('is-invalid')) {
+            if (!receiverMail_value || receiverMail.classList.contains('is-invalid')) {
             Swal.fire({
                 icon: "error",
                 title: "Falsche Email",
@@ -205,7 +205,7 @@
             })
 
             receiverMail.value = '';
-            dateValid.value = '';
+            dateValid.valueAsDate = new Date(new Date().setDate(new Date().getDate() + 8));
     });
 </script>
 }