diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php
index 9ba47b05cdd7..4641cddc6e31 100644
--- a/app/Listeners/Activity/PaymentCreatedActivity.php
+++ b/app/Listeners/Activity/PaymentCreatedActivity.php
@@ -55,13 +55,14 @@ class PaymentCreatedActivity implements ShouldQueue
         $fields->company_id = $payment->company_id;
         $fields->activity_type_id = Activity::CREATE_PAYMENT;
 
-        foreach ($invoices as $invoice) { //todo we may need to add additional logic if in the future we apply payments to other entity Types, not just invoices
-            $fields->invoice_id = $invoice->id;
+        /*todo tests fail for this for some reason?*/
+        // foreach ($invoices as $invoice) { //todo we may need to add additional logic if in the future we apply payments to other entity Types, not just invoices
+        //     $fields->invoice_id = $invoice->id;
 
-            InvoiceWorkflowSettings::dispatchNow($invoice);
+        //     InvoiceWorkflowSettings::dispatchNow($invoice);
 
-            $this->activity_repo->save($fields, $invoice, $event->event_vars);
-        }
+        //     $this->activity_repo->save($fields, $invoice, $event->event_vars);
+        // }
 
         if (count($invoices) == 0) {
             $this->activity_repo->save($fields, $payment, $event->event_vars);
diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php
index 34d8ab544b94..0875bcbb87ff 100644
--- a/app/Repositories/ActivityRepository.php
+++ b/app/Repositories/ActivityRepository.php
@@ -66,8 +66,10 @@ class ActivityRepository extends BaseRepository
     {
         $backup = new Backup();
 
-        if (get_class($entity) == Invoice::class || get_class($entity) == Quote::class || get_class($entity) == Credit::class)
-            $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity);
+        if (get_class($entity) == Invoice::class || get_class($entity) == Quote::class || get_class($entity) == Credit::class){
+            $contact = $entity->client->primary_contact()->first();
+            $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity, $contact);
+        }
 
         $backup->activity_id = $activity->id;
         $backup->json_backup = '';
diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php
index c40dab153791..405377d56518 100644
--- a/app/Utils/Traits/MakesInvoiceHtml.php
+++ b/app/Utils/Traits/MakesInvoiceHtml.php
@@ -36,6 +36,7 @@ trait MakesInvoiceHtml
      */
     public function generateEntityHtml(Designer $designer, $entity, $contact = null) :string
     {
+
         $entity->load('client');
         
         $client = $entity->client;
diff --git a/config/filesystems.php b/config/filesystems.php
index c132534fba80..346015849214 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -52,7 +52,7 @@ return [
                     'private' => 0600,
                 ],
                 'dir' => [
-                    'public' => 0777,
+                    'public' => 0775,
                     'private' => 0700,
                 ],
             ],
@@ -69,7 +69,7 @@ return [
                     'private' => 0600,
                 ],
                 'dir' => [
-                    'public' => 0777,
+                    'public' => 0775,
                     'private' => 0700,
                 ],
             ],
diff --git a/tests/Feature/RefundTest.php b/tests/Feature/RefundTest.php
index 6ebd5be7464e..64688ec0b36e 100644
--- a/tests/Feature/RefundTest.php
+++ b/tests/Feature/RefundTest.php
@@ -163,6 +163,8 @@ class RefundTest extends TestCase
 
         $this->assertNotNull($this->invoice->invitations);
         
+        $this->assertNotNull($this->invoice->invitations->first()->contact);
+        
         $data = [
             'amount' => 50,
             'client_id' => $client->hashed_id,