From d3a3083b8518a711826e4ced9f192b58a4e0fb8d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 18 Mar 2016 11:20:54 +0100
Subject: [PATCH] Error when blocked user logs in

---
 app/Http/Controllers/Auth/AuthController.php   | 2 +-
 resources/views/emails/blocked-login-html.twig | 2 +-
 resources/views/emails/blocked-login.twig      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 6e1cf6d568..da4ef51293 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -94,7 +94,7 @@ class AuthController extends Controller
               $email = env('SITE_OWNER', false);
               $fields = [
                 'user_id' => $foundUser->id,
-                'email' => $credentials['email'],
+                'user_address' => $credentials['email'],
                 'code' => $code,
                 'message' => $message,
                 'ip' => $request->ip(),
diff --git a/resources/views/emails/blocked-login-html.twig b/resources/views/emails/blocked-login-html.twig
index 052d0508d8..72c48eafd4 100644
--- a/resources/views/emails/blocked-login-html.twig
+++ b/resources/views/emails/blocked-login-html.twig
@@ -10,7 +10,7 @@
     Hey there,
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-  Firefly III has just blocked a login from user #{{ user_id }} ({{ email }}).
+  Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
   The blocked code was "{{ code }}" and the subsequent message was:
diff --git a/resources/views/emails/blocked-login.twig b/resources/views/emails/blocked-login.twig
index ea4ce0aede..ba0907da26 100644
--- a/resources/views/emails/blocked-login.twig
+++ b/resources/views/emails/blocked-login.twig
@@ -1,6 +1,6 @@
 Hey there,
 
-Firefly III has just blocked a login from user #{{ user_id }} ({{ email }}).
+Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
 
 The blocked code was "{{ code }}" and the subsequent message was:
 "{{ message }}"