diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6e11b41b38..619701b51f 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,8 +2,13 @@
 
 namespace FireflyIII\Http\Controllers\Auth;
 
+use FireflyConfig;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\User;
+use Illuminate\Cookie\CookieJar;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+
 
 class LoginController extends Controller
 {
@@ -37,4 +42,28 @@ class LoginController extends Controller
         parent::__construct();
         $this->middleware('guest')->except('logout');
     }
+
+    /**
+     * Show the application's login form.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    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('firefly.configuration.single_user_mode'))->data;
+        $userCount         = User::count();
+        $allowRegistration = true;
+        if ($singleUserMode === true && $userCount > 0) {
+            $allowRegistration = false;
+        }
+
+        $email    = $request->old('email');
+        $remember = $request->old('remember');
+
+        return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
+    }
 }
diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php
index fd4a0164ff..44454c1815 100644
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@@ -55,8 +55,7 @@ class MailError extends Job implements ShouldQueue
         $this->destination = $destination;
         $this->ipAddress   = $ipAddress;
         $this->exception   = $exceptionData;
-
-        $debug = $exceptionData;
+        $debug             = $exceptionData;
         unset($debug['stackTrace']);
         Log::error('Exception is: ' . json_encode($debug));
     }