diff --git a/app/Http/Controllers/Install/Database.php b/app/Http/Controllers/Install/Database.php
index ce3e916db..fc7a2aa2c 100644
--- a/app/Http/Controllers/Install/Database.php
+++ b/app/Http/Controllers/Install/Database.php
@@ -39,9 +39,10 @@ class Database extends Controller
         $database = $request['database'];
         $username = $request['username'];
         $password = $request['password'];
+        $prefix   = config("database.connections.$connection.prefix", null);
 
         // Check database connection
-        if (!Installer::createDbTables($host, $port, $database, $username, $password)) {
+        if (!Installer::createDbTables($host, $port, $database, $username, $password, $prefix)) {
             $response = [
                 'status' => null,
                 'success' => false,
diff --git a/app/Http/Resources/Document/DocumentItem.php b/app/Http/Resources/Document/DocumentItem.php
index f32047fd6..c74464459 100644
--- a/app/Http/Resources/Document/DocumentItem.php
+++ b/app/Http/Resources/Document/DocumentItem.php
@@ -22,6 +22,7 @@ class DocumentItem extends JsonResource
             'document_id' => $this->document_id,
             'item_id' => $this->item_id,
             'name' => $this->name,
+            'description' => $this->description,
             'price' => $this->price,
             'price_formatted' => money($this->price, $this->document->currency_code, true)->format(),
             'total' => $this->total,
diff --git a/app/Listeners/Email/DisablePersonDueToInvalidEmail.php b/app/Listeners/Email/DisablePersonDueToInvalidEmail.php
index 40f7e8ab5..395bfe302 100644
--- a/app/Listeners/Email/DisablePersonDueToInvalidEmail.php
+++ b/app/Listeners/Email/DisablePersonDueToInvalidEmail.php
@@ -36,6 +36,14 @@ class DisablePersonDueToInvalidEmail
             return;
         }
 
+        $companies = $event->user->companies;
+
+        foreach ($companies as $company) {
+            if ($company->users->count() <= 1) {
+                return;
+            }
+        }
+
         $event->user->enabled = false;
         $event->user->save();
     }
diff --git a/resources/views/components/documents/template/classic.blade.php b/resources/views/components/documents/template/classic.blade.php
index 2ad04c78f..603763e8f 100644
--- a/resources/views/components/documents/template/classic.blade.php
+++ b/resources/views/components/documents/template/classic.blade.php
@@ -17,9 +17,9 @@
                 @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
-                        <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
+                        <img  class="c-logo" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
                     @else
-                        <img  class="c-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
+                        <img  class="c-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                     @endif
                 @endif
                 @stack('company_logo_input_end')
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
index 68a20be61..1187eb3f4 100644
--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@@ -17,9 +17,9 @@
                 @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
-                        <img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
+                        <img class="d-logo" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
                     @else
-                        <img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
+                        <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
                     @endif
                 @endif
                 @stack('company_logo_input_end')
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
index 97606584c..9ef940c1b 100644
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@@ -17,9 +17,9 @@
                 @stack('company_logo_input_start')
                 @if (! $hideCompanyLogo)
                     @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
-                        <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
+                        <img class="radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
                     @else
-                        <img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
+                        <img class="radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
                     @endif
                 @endif
                 @stack('company_logo_input_end')