diff --git a/app/Console/Commands/ReactBuilder.php b/app/Console/Commands/ReactBuilder.php
index 7e75e59887b7..430b16d90542 100644
--- a/app/Console/Commands/ReactBuilder.php
+++ b/app/Console/Commands/ReactBuilder.php
@@ -51,8 +51,8 @@ class ReactBuilder extends Command
         $directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
-            if (str_contains($file->getFileName(), '.js') && !strpos($file->getFileName(), '.json')) {
-                if (str_contains($file->getFileName(), 'index.')) {
+            if ($file->getExtension() == 'js') {
+                if (str_contains($file->getFileName(), 'index-')) {
                     $includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
                 } else {
                     $includes .= '<link rel="modulepreload" href="/react/'.$file->getFileName().'">'."\n";
diff --git a/app/Services/Email/Email.php b/app/Services/Email/Email.php
index d47d3c5f6b16..46f1016a993b 100644
--- a/app/Services/Email/Email.php
+++ b/app/Services/Email/Email.php
@@ -143,6 +143,8 @@ class Email implements ShouldQueue
 
         $this->email_object->signature = $this->email_object->settings->email_signature;
 
+        $this->email_object->invitation_key = $this->email_object->invitation ? $this->email_object->invitation->key : null;
+        
         $this->resolveVariables();
 
         return $this;
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index b63b506c7d2f..1b08585f64c6 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -76,7 +76,8 @@ class EmailDefaults
              ->setReplyTo()
              ->setBcc()
              ->setAttachments()
-             ->setVariables();
+             ->setVariables()
+             ->setHeaders();
         
         return $this->email->email_object;
     }
@@ -369,7 +370,7 @@ class EmailDefaults
     private function setHeaders(): self
     {
         if ($this->email->email_object->invitation_key) {
-            $this->email->email_object->headers = array_merge($this->email->email_object->headers, ['x-invitation-key' => $this->email->email_object->invitation_key]);
+            $this->email->email_object->headers = array_merge($this->email->email_object->headers, ['x-invitation' => $this->email->email_object->invitation_key]);
         }
 
         return $this;
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 57df2ca3181e..30053f64a249 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -206,7 +206,7 @@
         gap: 80px;
         padding-left: 2rem;
         padding-right: 0rem;
-        page-break-inside:auto;
+        break-inside: avoid;
         overflow: visible !important;
     }
 
@@ -271,7 +271,7 @@
 
     #footer {
         margin-top: 1rem;
-        page-break-inside:auto;
+        break-inside: avoid;
         overflow: visible !important;
     }