diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index d2aebc62d02e..7e522f426acb 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -26,7 +26,7 @@ class Helpers
             $elements['signature'] = '';
             $elements['settings'] = new stdClass;
             $elements['whitelabel'] = true;
-
+            $elements['company'] = '';
             return $elements;
         }
 
@@ -35,7 +35,8 @@ class Helpers
         $elements['signature'] = $_settings->email_signature;
         $elements['settings'] = $_settings;
         $elements['whitelabel'] = $client->user->account->isPaid() ? true : false;
-
+        $elements['company'] = $client->company;
+        
         return $elements;
     }
 
diff --git a/resources/views/email/auth/password-reset.blade.php b/resources/views/email/auth/password-reset.blade.php
index ac5ebb54e274..de1673f452e8 100644
--- a/resources/views/email/auth/password-reset.blade.php
+++ b/resources/views/email/auth/password-reset.blade.php
@@ -1,4 +1,4 @@
-@component('email.template.master', ['design' => 'light', 'whitelabel' => false])
+@component('email.template.master', ['design' => 'light', 'whitelabel' => false, 'company' => $company])
 
     @slot('header')
         @include('email.components.header', ['logo' => $logo])
diff --git a/resources/views/email/template/dark.blade.php b/resources/views/email/template/dark.blade.php
index 5686fde210ba..00f04ff77bf8 100644
--- a/resources/views/email/template/dark.blade.php
+++ b/resources/views/email/template/dark.blade.php
@@ -1,7 +1,7 @@
 @component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
 
     @slot('header')
-        @include('email.components.header', ['logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
+        @include('email.components.header', ['logo' => $company->present()->logo($settings)])
     @endslot
 
     {!! $body !!}
diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php
index 071de7226d99..064cc9d357e6 100644
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@@ -1,7 +1,7 @@
 @component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
 
 @slot('header')
-    @include('email.components.header', ['logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
+    @include('email.components.header', ['logo' => $company->present()->logo($settings)])
 @endslot
 
 {!! $body !!}