diff --git a/app/config/auth.php b/app/config/auth.php
index 63c84908..f567569d 100644
--- a/app/config/auth.php
+++ b/app/config/auth.php
@@ -28,7 +28,7 @@ return [
     |
     */
 
-    'model' => 'User',
+    'model' => 'CachetHQ\Cachet\Models\User',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php
index a91a31ac..9d319f7f 100644
--- a/app/views/auth/login.blade.php
+++ b/app/views/auth/login.blade.php
@@ -11,7 +11,7 @@
                 <legend>{{ trans('cachet.login_message') }}</legend>
 
                 @if(Session::has('error'))
-                <span class='text-danger'>{{ Session::get('error') }}</span>
+                <p class='text-danger'>{{ Session::get('error') }}</p>
                 @endif
 
                 <div class='form-group'>