diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index b0a3e6ad22..09011d49ae 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -660,7 +660,12 @@ class ObjectImportCommand extends Command
             $last_name = $user_email_array['last_name'];
 
             if ($user_email=='') {
-                $user_email = $user_email_array['username'].'@'.Setting::getSettings()->email_domain;
+                if (Setting::getSettings()->email_domain) {
+                    $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
+                } else {
+                    $user_email = '';
+                }
+
             }
 
             if ($user_username=='') {
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 3c1d7fffbe..853b6e0108 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -12,7 +12,7 @@
 
             <div class="col-md-4 col-md-offset-4">
 
-                    <div class="box login-box">
+                <div class="box login-box" style="width: 100%">
                         <div class="box-header">
                             <h3 class="box-title"> {{ trans('auth/general.send_password_link')  }}</h3>
                         </div>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index b3f12e467e..af14a2a6fc 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -13,7 +13,7 @@
 
 
 
-                <div class="col-md-4 col-md-offset-4">
+                <div class="col-md-6 col-md-offset-3">
 
                     <div class="box login-box" style="width: 100%">
                         <div class="box-header">
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index e08c11ba9d..850b6c3fdd 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -33,12 +33,36 @@
     <link rel="stylesheet" href="{{ asset('assets/css/bootstrap-table.css') }}">
 
     <link rel="stylesheet" href="{{ elixir('assets/css/app.css') }}">
+    <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
 
 
+    @if (\App\Models\Setting::getSettings()->header_color)
+        <style>
+        .main-header .navbar, .main-header .logo {
+        background-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        background: -webkit-linear-gradient(top,  {{ \App\Models\Setting::getSettings()->header_color }} 0%,{{ \App\Models\Setting::getSettings()->header_color }} 100%);
+        background: linear-gradient(to bottom, {{ \App\Models\Setting::getSettings()->header_color }} 0%,{{ \App\Models\Setting::getSettings()->header_color }} 100%);
+        border-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+        .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
+        border-left-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+
+        .btn-primary {
+        background-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        border-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+        </style>
+
+    @endif
+
 </head>
 
 <body class="hold-transition login-page">
 
+    @if (\App\Models\Setting::getSettings()->logo!='')
+    <center><img class="logo" style="padding-top: 20px; padding-bottom: 10px;" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}"></center>
+    @endif
   <!-- Content -->
   @yield('content')
 
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index d76e42585c..a91470a829 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -32,6 +32,8 @@
 
     <link rel="stylesheet" href="{{ asset(elixir('assets/css/app.css')) }}">
 
+    <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
+
     <style>
     @if (\App\Models\Setting::getSettings()->header_color)
     .main-header .navbar, .main-header .logo {
