diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index 3c03ea27e..dc9c4ce3b 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -1,13 +1,18 @@
 @component('mail::layout')
 {{-- Header --}}
 @slot('header')
-@component('mail::header', ['url' => config('app.url')])
 
 {{-- Check that the $snipeSettings variable is set, images are set to be shown, and setup is complete --}}
 
 
 @if (isset($snipeSettings) && ($snipeSettings::setupCompleted()))
 
+    @if ($snipeSettings->show_url_in_emails=='1' )
+        @component('mail::header', ['url' => config('app.url')])
+    @else
+        @component('mail::header', ['url' => ''])
+    @endif
+
     {{-- Show images in email!  --}}
     @if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))
 
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 986beb9c8..0147ef40d 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -73,16 +73,26 @@ $style = [
                         <td style="{{ $style['email-masthead'] }}">
 
                             @if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
+                                @php
+                                    $logo = '';
+                                    if ($snipeSettings->logo != ''){
+                                        $logo = $snipeSettings->logo;
+                                    }
+
+                                    if ($snipeSettings->email_logo != ''){
+                                        $logo = $snipeSettings->email_logo;
+                                    }
+                                @endphp
 
                                 @if ($snipeSettings->brand == '3')
-                                    @if ($snipeSettings->logo!='')
-                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+                                    @if ($logo!='')
+                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
                                     @endif
                                     {{ $snipeSettings->site_name }}
 
                                 @elseif ($snipeSettings->brand == '2')
-                                    @if ($snipeSettings->logo!='')
-                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+                                    @if ($logo!='')
+                                        <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
                                     @endif
                                 @else
                                     {{ $snipeSettings->site_name }}