diff --git a/resources/views/client_login.blade.php b/resources/views/client_login.blade.php
new file mode 100644
index 000000000000..c9761e09c16c
--- /dev/null
+++ b/resources/views/client_login.blade.php
@@ -0,0 +1,19 @@
+@extends('master')
+
+@section('head')
+    @if (!empty($clientauth) && $fontsUrl = Utils::getAccountFontsUrl())
+        <link href="{{ $fontsUrl }}" rel="stylesheet" type="text/css">
+    @endif
+    <link href="{{ asset('css/built.public.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
+    <link href="{{ asset('css/bootstrap.min.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
+    <link href="{{ asset('css/built.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
+    <link href="{{ asset('css/built.login.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
+
+    @if (!empty($clientauth))
+        <style type="text/css">{!! Utils::clientViewCSS() !!}</style>
+    @endif
+@endsection
+
+@section('body')
+    @yield('form')
+@endsection
diff --git a/resources/views/clientauth/login.blade.php b/resources/views/clientauth/login.blade.php
index e318074afb1b..b76092ac482d 100644
--- a/resources/views/clientauth/login.blade.php
+++ b/resources/views/clientauth/login.blade.php
@@ -1,4 +1,4 @@
-@extends('login')
+@extends('client_login')
 
 @section('form')
 
diff --git a/resources/views/clientauth/passwords/email.blade.php b/resources/views/clientauth/passwords/email.blade.php
index dfd7f0bb9059..1b890af923af 100644
--- a/resources/views/clientauth/passwords/email.blade.php
+++ b/resources/views/clientauth/passwords/email.blade.php
@@ -1,4 +1,4 @@
-@extends('login')
+@extends('client_login')
 
 @section('form')
     @include('partials.warn_session', ['redirectTo' => '/client/session_expired'])
diff --git a/resources/views/clientauth/sessionexpired.blade.php b/resources/views/clientauth/sessionexpired.blade.php
index e592ba71001d..8c163e57b8f6 100644
--- a/resources/views/clientauth/sessionexpired.blade.php
+++ b/resources/views/clientauth/sessionexpired.blade.php
@@ -1,8 +1,8 @@
-@extends('login')
+@extends('client_login')
 @section('form')
     <div class="form-signin">
         <h2 class="form-signin-heading">{{ trans('texts.session_expired') }}</h2>
         <hr class="green">
         <div><center>{{ trans('texts.client_session_expired_message') }}</center></div>
     </div>
-@endsection
\ No newline at end of file
+@endsection