diff --git a/app/Events/AuthLoginEvent.php b/app/Listeners/AuthLogin.php
similarity index 50%
rename from app/Events/AuthLoginEvent.php
rename to app/Listeners/AuthLogin.php
index 72c6e74e6..e8a274e06 100644
--- a/app/Events/AuthLoginEvent.php
+++ b/app/Listeners/AuthLogin.php
@@ -1,19 +1,16 @@
 <?php
 
-namespace App\Events;
+namespace App\Listeners;
 
 use App\User;
 use App\UserSetting;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
-class AuthLoginEvent
+class AuthLogin
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
     /**
-     * Create a new event instance.
+     * Create the event listener.
      *
      * @return void
      */
@@ -22,8 +19,15 @@ class AuthLoginEvent
         //
     }
 
-    public function handle(User $user)
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle($event)
     {
+        $user = $event->user;
         if (empty($user->settings)) {
             $settings = new UserSetting();
             $settings->user_id = $user->id;
diff --git a/app/Listeners/LogFailedLogin.php b/app/Listeners/LogFailedLogin.php
new file mode 100644
index 000000000..e289ea577
--- /dev/null
+++ b/app/Listeners/LogFailedLogin.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Listeners;
+
+use App\AccountLog;
+use App\User;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class LogFailedLogin
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle($event)
+    {
+        $user = $event->user;
+        $request = request();
+
+        $log = new AccountLog();
+        $log->user_id = $user->id;
+        $log->item_id = $user->id;
+        $log->item_type = 'App\User';
+        $log->action = 'auth.failed';
+        $log->message = 'Failed login attempt';
+        $log->link = null;
+        $log->ip_address = $request->ip();
+        $log->user_agent = $request->userAgent();
+        $log->save();
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 4ebcb57a2..b632bca98 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -13,11 +13,11 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
+        'Illuminate\Auth\Events\Login' => [
+            'App\Listeners\AuthLogin',
         ],
-        'auth.login' => [
-            'App\Events\AuthLoginEvent',
+        'Illuminate\Auth\Events\Failed' => [
+            'App\Listeners\LogFailedLogin',
         ],
     ];