diff --git a/resources/views/email/admin/generic.blade.php b/resources/views/email/admin/generic.blade.php
index ee0038c48..b0a3d23cc 100644
--- a/resources/views/email/admin/generic.blade.php
+++ b/resources/views/email/admin/generic.blade.php
@@ -22,10 +22,6 @@
         @lang($button)
     @endcomponent
 
-    @slot('signature')
-        {{ $signature }}
-    @endslot
-
     @if(isset($whitelabel) && !$whitelabel)
         @slot('footer')
             @component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
diff --git a/resources/views/email/template/dark.blade.php b/resources/views/email/template/dark.blade.php
index 00f04ff77..c756a9117 100644
--- a/resources/views/email/template/dark.blade.php
+++ b/resources/views/email/template/dark.blade.php
@@ -6,10 +6,12 @@
 
     {!! $body !!}
 
-    @slot('below_card')
-        @if($signature)
-            {{ $signature }}
-        @endif
-    @endslot
+@if($signature)
+<br>
+<br>
+<p>
+    {{ $signature }}
+</p>
+@endif
 
 @endcomponent
diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php
index 064cc9d35..5effdb81e 100644
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@@ -6,10 +6,12 @@
 
 {!! $body !!}
 
-@slot('below_card')
-    @if($signature)
-        {{ $signature }}
-    @endif
-@endslot
+@if($signature)
+<br>
+<br>
+<p>
+    {{ $signature }}
+</p>
+@endif
 
 @endcomponent
diff --git a/resources/views/email/template/plain.blade.php b/resources/views/email/template/plain.blade.php
index 797454851..9fe5c6f6f 100644
--- a/resources/views/email/template/plain.blade.php
+++ b/resources/views/email/template/plain.blade.php
@@ -24,6 +24,13 @@
                         </table>
                     </td>
                 </tr>
+                @if($signature)
+                    <tr>
+                        <td>
+                            <p>{{ $signature }}</p>
+                        </td>
+                    </tr>
+                @endif
                 <tr>
                     @isset($whitelabel)
                         @if(!$whitelabel)