From 4ab9807cbea1449db7948acd2abf21e2fa09ae93 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Wed, 15 Jun 2016 08:54:13 +0100
Subject: [PATCH] Help password managers. Fixes #1910

---
 app/Http/Controllers/AuthController.php | 6 +++---
 resources/views/auth/login.blade.php    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index fff386bb..b6d63570 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -41,11 +41,11 @@ class AuthController extends Controller
      */
     public function postLogin()
     {
-        $loginData = Binput::only(['login', 'password']);
+        $loginData = Binput::only(['username', 'password']);
 
         // Login with username or email.
-        $loginKey = Str::contains($loginData['login'], '@') ? 'email' : 'username';
-        $loginData[$loginKey] = array_pull($loginData, 'login');
+        $loginKey = Str::contains($loginData['username'], '@') ? 'email' : 'username';
+        $loginData[$loginKey] = array_pull($loginData, 'username');
 
         // Validate login credentials.
         if (Auth::validate($loginData)) {
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 9c4fb5dc..e26c92d2 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -21,7 +21,7 @@
 
                 <div class="form-group">
                     <label class="sr-only">{{ trans('forms.login.login') }}</label>
-                    <input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.login') }}" required="required" name="login" type="text" value="{{ Binput::old('login') }}" autofocus>
+                    <input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.login') }}" required="required" name="username" type="text" value="{{ Binput::old('username') }}" autofocus>
                 </div>
                 <div class="form-group">
                     <label class="sr-only">{{ trans('forms.login.password') }}</label>