diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 88567ad27741..0b3984acc207 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -92,6 +92,15 @@ class Utils
         return Utils::getResllerType() ? true : false;
     }
 
+    public static function isWhiteLabel()
+    {
+        if (Utils::isNinjaProd()) {
+            return false;
+        }
+        
+        return \App\Models\Account::first()->hasFeature(FEATURE_WHITE_LABEL);
+    }
+
     public static function getResllerType()
     {
         return isset($_ENV['RESELLER_TYPE']) ? $_ENV['RESELLER_TYPE'] : false;
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index df4324723a97..6ea0973c2f03 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -17,6 +17,7 @@
     }
     .modal-header h4 {
         margin:0;
+        color:#fff;
     }
     .modal-header img {
         float: left;
@@ -89,10 +90,14 @@
     {{ Former::populateField('remember', 'true') }}
 
     <div class="modal-header">
-        <a href="{{ NINJA_WEB_URL }}" target="_blank">
-            <img src="{{ asset('images/icon-login.png') }}" />
-            <h4>Invoice Ninja | {{ trans('texts.account_login') }}</h4>
-        </a>
+        @if (Utils::isWhiteLabel())
+            <h4>{{ trans('texts.account_login') }}</h4>
+        @else
+            <a href="{{ NINJA_WEB_URL }}" target="_blank">
+                <img src="{{ asset('images/icon-login.png') }}" />
+                <h4>Invoice Ninja | {{ trans('texts.account_login') }}</h4>
+            </a>
+        @endif
     </div>
         <div class="inner">
             <p>
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php
index 8106b4762eb0..4cd20002c2f4 100644
--- a/resources/views/auth/password.blade.php
+++ b/resources/views/auth/password.blade.php
@@ -76,8 +76,15 @@
 
 {!! Former::open('recover_password')->rules(['email' => 'required|email'])->addClass('form-signin') !!}
   <div class="modal-header">
-    <img src="{{ asset('images/icon-login.png') }}" />
-    <h4>Invoice Ninja | {{ trans('texts.password_recovery') }}</h4></div>
+      @if (Utils::isWhiteLabel())
+          <h4>{{ trans('texts.password_recovery') }}</h4>
+      @else
+          <a href="{{ NINJA_WEB_URL }}" target="_blank">
+              <img src="{{ asset('images/icon-login.png') }}" />
+          </a>
+          <h4>Invoice Ninja | {{ trans('texts.password_recovery') }}</h4>
+      @endif
+  </div>
     <div class="inner">
 
       <p>
diff --git a/resources/views/clientauth/sessionexpired.blade.php b/resources/views/clientauth/sessionexpired.blade.php
index 1fca7a79b4a7..86a1c26c046a 100644
--- a/resources/views/clientauth/sessionexpired.blade.php
+++ b/resources/views/clientauth/sessionexpired.blade.php
@@ -62,18 +62,11 @@
     <div class="container">
         <div class="form-signin">
             <div class="modal-header">
-                @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL))
-                    <a href="{{ NINJA_WEB_URL }}" target="_blank">
-                        <img src="{{ asset('images/icon-login.png') }}" />
-                        <h4>Invoice Ninja | {{ trans('texts.client_session_expired') }}</h4>
-                    </a>
-                @else
-                    <h4>{{ trans('texts.session_expired') }}</h4>
-                @endif
+                <h4>{{ trans('texts.session_expired') }}</h4>
             </div>
             <div class="inner">
                 <div class="alert alert-info">{{ trans('texts.client_session_expired_message') }}</div>
             </div>
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection