diff --git a/app/Http/Controllers/ClientAuth/PasswordController.php b/app/Http/Controllers/ClientAuth/PasswordController.php
index 707208276f2f..bf3f2da9c974 100644
--- a/app/Http/Controllers/ClientAuth/PasswordController.php
+++ b/app/Http/Controllers/ClientAuth/PasswordController.php
@@ -74,7 +74,7 @@ class PasswordController extends Controller
         $contactKey = session('contact_key');
         if ($contactKey) {
             $contact = Contact::where('contact_key', '=', $contactKey)->first();
-            if ($contact && ! $contact->is_deleted) {
+            if ($contact && ! $contact->is_deleted && $contact->email) {
                 $contactId = $contact->id;
             }
         }
diff --git a/resources/views/emails/client_password.blade.php b/resources/views/emails/client_password.blade.php
index 310ac73782e4..1e732bcfe4ed 100644
--- a/resources/views/emails/client_password.blade.php
+++ b/resources/views/emails/client_password.blade.php
@@ -1,4 +1,4 @@
-@extends('emails.master_user')
+@extends('emails.master_contact')
 
 @section('body')
     <div>
@@ -14,11 +14,13 @@
             ])
         </center>
     </div>
-    &nbsp;
-    <div>
-        {{ trans('texts.email_signature') }}<br/>
-        {{ trans('texts.email_from') }}
-    </div>
+    @if (Utils::isNinja() || ! Utils::isWhiteLabel())
+        &nbsp;
+        <div>
+            {{ trans('texts.email_signature') }}<br/>
+            {{ trans('texts.email_from') }}
+        </div>
+    @endif
     &nbsp;
     <div>
         {{ trans('texts.reset_password_footer', ['email' => env('CONTACT_EMAIL', CONTACT_EMAIL)]) }}
diff --git a/resources/views/emails/master_contact.blade.php b/resources/views/emails/master_contact.blade.php
new file mode 100644
index 000000000000..56124953bff3
--- /dev/null
+++ b/resources/views/emails/master_contact.blade.php
@@ -0,0 +1,41 @@
+@extends('emails.master')
+
+@section('content')
+    <tr>
+        <td bgcolor="#F4F5F5" style="border-collapse: collapse;">&nbsp;</td>
+    </tr>
+    <tr>
+        <td style="border-collapse: collapse;">
+            <table cellpadding="10" cellspacing="0" border="0" bgcolor="#2F2C2B" width="600" align="center" class="header">
+                <tr>
+                    <td class="logo" style="border-collapse: collapse; vertical-align: middle; padding-left:34px; padding-top:20px; padding-bottom:12px" valign="middle">
+                        @if (Utils::isNinja() || ! Utils::isWhiteLabel())
+                            <img src="{{ $message->embed(public_path('images/invoiceninja-logo.png')) }}" alt="Invoice Ninja" />
+                        @endif
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td class="content" style="border-collapse: collapse;">
+            <div style="font-size: 18px; margin: 42px 40px 42px; padding: 0;">
+                @yield('body')
+            </div>
+        </td>
+    </tr>
+@stop
+
+@section('footer')
+    @if (Utils::isNinja() || ! Utils::isWhiteLabel())
+        <p style="color: #A7A6A6; font-size: 13px; line-height: 18px; margin: 0 0 7px; padding: 0;">
+            <a href="{{ SOCIAL_LINK_FACEBOOK }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;"><img src="{{ $message->embed(public_path('images/emails/icon-facebook.png')) }}" alt="Facebook" /></a>
+            <a href="{{ SOCIAL_LINK_TWITTER }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;"><img src="{{ $message->embed(public_path('images/emails/icon-twitter.png')) }}" alt="Twitter" /></a>
+            <a href="{{ SOCIAL_LINK_GITHUB }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;"><img src="{{ $message->embed(public_path('images/emails/icon-github.png')) }}" alt="GitHub" /></a>
+        </p>
+
+        <p style="color: #A7A6A6; font-size: 13px; line-height: 18px; margin: 0 0 7px; padding: 0;">
+            © {{ date('Y') }} Invoice Ninja<br />
+        </p>
+    @endif
+@stop