diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index d5df45487874..e1e4f7409bbe 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -781,7 +781,9 @@ class BaseController extends Controller
             case 'next':
                 return 'main.next.dart.js';      
             case 'profile':
-                return 'main.profile.dart.js';                                     
+                return 'main.profile.dart.js';  
+            case 'html':             
+                return 'main.html.dart.js';                        
             default:
                 return 'main.foss.dart.js';
 
diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index d0cc8e5de96b..888fcf1c235b 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -69,7 +69,7 @@ class SupportMessageSent extends Mailable
         if(Ninja::isHosted())
             $subject = "{$priority}Hosted-{$db}-{$is_large}{$platform}{$migrated} :: {$plan} :: ".date('M jS, g:ia');
         else
-            $subject = "{$priority}Self Hosted :: {$plan} :: {$platform} :: ".date('M jS, g:ia');
+            $subject = "{$priority}Self Hosted :: {$plan} :: {$is_large}{$platform}{$migrated} :: ".date('M jS, g:ia');
 
         return $this->from(config('mail.from.address'), $user->present()->name()) 
                 ->replyTo($user->email, $user->present()->name())
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 4582ab1f2dba..cd9c0f4b1335 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -11,6 +11,7 @@
 
 namespace Tests;
 
+use App\DataMapper\ClientRegistrationFields;
 use App\DataMapper\ClientSettings;
 use App\DataMapper\CompanySettings;
 use App\Factory\CompanyUserFactory;
@@ -173,6 +174,8 @@ trait MockAccountData
                             'account_id' => $this->account->id,
                         ]);
 
+        $this->company->client_registration_fields = ClientRegistrationFields::generate();
+
         Storage::makeDirectory($this->company->company_key.'/documents', 0755, true);
         Storage::makeDirectory($this->company->company_key.'/images', 0755, true);