diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 0b40b07e..e809da37 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -41,6 +41,19 @@ class LoginController extends Controller
         $this->middleware('guest')->except('logout');
     }
 
+    /**
+     * Get the login username to be used by the controller.
+     *
+     * @return string
+     */
+    public function username()
+    {
+        $login = request()->input('email');
+        $field = filter_var($login, FILTER_VALIDATE_EMAIL) ? 'email' : 'name';
+        request()->merge([$field => $login]);
+        return $field;
+    }
+
     public function login(Request $request)
     {
         $validationRules = [
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 727e23f2..06438326 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -31,9 +31,9 @@
 
                         <div class="form-group">
                             <div class="input-group mb-3">
-                                <input type="email" name="email"
+                                <input type="text" name="email"
                                     class="form-control @error('email') is-invalid @enderror"
-                                    placeholder="{{ __('Email') }}">
+                                    placeholder="{{ __('Email or Username') }}">
                                 <div class="input-group-append">
                                     <div class="input-group-text">
                                         <span class="fas fa-envelope"></span>