diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index df98ac38..f3ff857c 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -31,7 +31,7 @@ return [
         'email'         => 'Email',
         'password'      => 'Password',
         '2fauth'        => 'Authentication Code',
-        'invalid'       => 'Invalid email or password',
+        'invalid'       => 'Invalid username or password',
         'invalid-token' => 'Invalid token',
         'cookies'       => 'You must enable cookies to login.',
     ],
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 0cf8a5e6..f1d4bec6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -31,7 +31,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" autofocus>
+                        <input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.login') }}" required="required" name="login" type="text" value="{{ Binput::old('login') }}" autofocus>
                     </div>
                     <div class="form-group">
                         <label class="sr-only">{{ trans('forms.login.password') }}</label>