diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 21b78f3a3cc1..16db0a89b093 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -844,7 +844,7 @@ class InvoiceController extends BaseController
         $file_path = $invoice->service()->getInvoiceDeliveryNote($invoice, $invoice->invitations->first()->contact);
         
         try {
-        $file = public_path("storage/{$file_path}");
+            $file = public_path("storage/{$file_path}");
 
 
             return response()->download($file, basename($file));
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 2b136d717d28..37e525bfc8df 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -69,7 +69,7 @@ class SetupController extends Controller
 
         try {
             $db = SystemHealth::dbCheck($request);
-            
+
             if ($db['success'] == false) {
                 throw new \Exception($db['message']);
             }
@@ -81,10 +81,12 @@ class SetupController extends Controller
         }
 
         try {
-            $smtp = SystemHealth::testMailServer($request);
+            if ($request->mail_driver != 'log') {
+                $smtp = SystemHealth::testMailServer($request);
 
-            if ($smtp['success'] == false) {
-                throw new \Exception($smtp['message']);
+                if ($smtp['success'] == false) {
+                    throw new \Exception($smtp['message']);
+                }
             }
         } catch (\Exception $e) {
             return response([
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index d3c6e9479a44..509a9414a0bc 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -34,8 +34,9 @@ class QueryLogging
         $timeStart = microtime(true);
 
         // Enable query logging for development
-        if (config('ninja.app_env') == 'production') 
+        if (config('ninja.app_env') == 'production') {
             return $next($request);
+        }
 
         DB::enableQueryLog();
 
diff --git a/app/Jobs/Ninja/SendReminders.php b/app/Jobs/Ninja/SendReminders.php
index 934c42c10d7f..cc6b3f1ae22e 100644
--- a/app/Jobs/Ninja/SendReminders.php
+++ b/app/Jobs/Ninja/SendReminders.php
@@ -14,6 +14,7 @@ namespace App\Jobs\Ninja;
 use App\DataMapper\InvoiceItem;
 use App\Events\Invoice\InvoiceWasEmailed;
 use App\Jobs\Entity\EmailEntity;
+use App\Jobs\Util\WebHookHandler;
 use App\Libraries\MultiDB;
 use App\Models\Invoice;
 use App\Models\Webhook;
@@ -26,7 +27,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
-use App\Jobs\Util\WebHookHandler;
 
 class SendReminders implements ShouldQueue
 {
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index fa60cde15bec..eb83e7d7747e 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -343,7 +343,7 @@ class HtmlEngine
         $data['$item'] = ['value' => '', 'label' => ctrans('texts.item')];
         $data['$description'] = ['value' => '', 'label' => ctrans('texts.description')];
 
-        $data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => '']; 
+        $data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => ''];
 
         // $data['custom_label1']              = ['value' => '', 'label' => ctrans('texts.')];
         // $data['custom_label2']              = ['value' => '', 'label' => ctrans('texts.')];
diff --git a/app/Utils/Number.php b/app/Utils/Number.php
index 6e2c4c46d7bc..6d6c85c49fcd 100644
--- a/app/Utils/Number.php
+++ b/app/Utils/Number.php
@@ -103,7 +103,7 @@ class Number
         $value = number_format($value, $precision, $decimal, $thousand);
         $symbol = $currency->symbol;
 
-        if ($client->getSetting('show_currency_code') === true && $currency->code == 'CHF'){
+        if ($client->getSetting('show_currency_code') === true && $currency->code == 'CHF') {
             return "{$code} {$value}";
         } elseif ($client->getSetting('show_currency_code') === true) {
             return "{$value} {$code}";
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 7ea3ff929556..b756eba1d416 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -602,15 +602,12 @@ trait GeneratesCounter
         }
 
         if ($entity instanceof Vendor) {
-
             $search[] = '{$vendor_id_number}';
             $replace[] = $entity->id_number;
-
-        } 
+        }
         
         if ($entity instanceof Expense) {
-
-            if($entity->vendor){
+            if ($entity->vendor) {
                 $search[] = '{$vendor_id_number}';
                 $replace[] = $entity->vendor->id_number;
 
@@ -629,7 +626,7 @@ trait GeneratesCounter
 
             $search[] = '{$expense_id_number}';
             $replace[] = $entity->id_number;
-        } 
+        }
         
         if ($entity->client) {
             $search[] = '{$client_custom1}';