diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php
index 60287db88b..8478a8fa8e 100644
--- a/app/Http/Controllers/LicenseController.php
+++ b/app/Http/Controllers/LicenseController.php
@@ -168,6 +168,11 @@ class LicenseController extends BaseController
         /* Catch claim license requests */
         if (config('ninja.environment') == 'selfhost') {
 
+            if(config('ninja.license_key')){
+                nlog("License key found in config - using that instead");
+                $license_key = config('ninja.license_key');
+            }
+
             nlog("Claiming v5 license");
 
             $response = Http::get("https://invoicing.co/claim_license", [
diff --git a/app/Services/Pdf/PdfBuilder.php b/app/Services/Pdf/PdfBuilder.php
index 1a0f0aa6b1..321e50f98c 100644
--- a/app/Services/Pdf/PdfBuilder.php
+++ b/app/Services/Pdf/PdfBuilder.php
@@ -212,9 +212,9 @@ class PdfBuilder
             $template = $template->render($data);
 
             $f = $this->document->createDocumentFragment();
-
+            
+            $template = str_ireplace(['<br>', '<br />'], "<br/>", $template);
             $f->appendXML($template);
-            // $f->appendXML($template);
 
             $replacements[] = $f;
 
@@ -2093,7 +2093,10 @@ class PdfBuilder
             $child['content'] = $child['content'] ?? '';
 
             if ($this->service->company->markdown_enabled && $this->isMarkdown($child['content'])) {
-                $child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "\r", $child['content']);
+
+                // $child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "\r", $child['content']); //13-05-2025 - testing whether /r or <br/> can work
+
+                $child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "<br/>", $child['content']); //13-05-2025 - testing whether /r or <br/> can work
                 $child['content'] = $this->commonmark->convert($child['content']); //@phpstan-ignore-line
             }