From 6f933b3bd159c60a38e89e766ad6955f335fcbd8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 1 Apr 2017 08:13:43 +0200
Subject: [PATCH] Small updates.

---
 app/Http/Controllers/Auth/LoginController.php | 6 ++++--
 resources/views/list/piggy-banks.twig         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 655559ba39..d02e9e34d7 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -114,8 +114,10 @@ class LoginController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function showLoginForm(Request $request)
+    public function showLoginForm(Request $request, CookieJar $cookieJar)
     {
+        // forget 2fa cookie:
+        $cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
         // is allowed to?
         $singleUserMode    = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
@@ -127,7 +129,7 @@ class LoginController extends Controller
         $email    = $request->old('email');
         $remember = $request->old('remember');
 
-        return view('auth.login', compact('allowRegistration', 'email', 'remember'));
+        return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
     }
 
     /**
diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig
index 2d6556f483..cee5a80dd1 100644
--- a/resources/views/list/piggy-banks.twig
+++ b/resources/views/list/piggy-banks.twig
@@ -32,7 +32,7 @@
                 </div>
             </td>
             <td>
-                <a href="{{ route('piggy-banks.show', piggyBank.id) }}" title="{{ piggyBank.name }}">{{ piggyBank.name }}</a>
+                <a href="{{ route('piggy-banks.show', piggyBank.id) }}" title="{{ piggyBank.account.name }}">{{ piggyBank.name }}</a>
             </td>
             <td style="text-align: right;">
                 <span title="Saved so far" style="text-align:right;">{{ piggyBank.savedSoFar|formatAmount }}</span>