diff --git a/application/views/pages/login.php b/application/views/pages/login.php
index d54cff4a..f68e5763 100644
--- a/application/views/pages/login.php
+++ b/application/views/pages/login.php
@@ -18,14 +18,18 @@
         <label for="username" class="form-label">
             <?= lang('username') ?>
         </label>
-        <input type="text" id="username" placeholder="<?= lang('enter_username_here') ?>" class="form-control"/>
+        <input type="text" id="username" placeholder="<?= lang(
+            'enter_username_here',
+        ) ?>" class="form-control" required/>
     </div>
 
     <div class="mb-5">
         <label for="password" class="form-label">
             <?= lang('password') ?>
         </label>
-        <input type="password" id="password" placeholder="<?= lang('enter_password_here') ?>" class="form-control"/>
+        <input type="password" id="password" placeholder="<?= lang(
+            'enter_password_here',
+        ) ?>" class="form-control" required/>
     </div>
 
     <div class="d-flex justify-content-between align-items-center mb-5">
diff --git a/assets/js/pages/login.js b/assets/js/pages/login.js
index 06282cb5..3ad7bd35 100644
--- a/assets/js/pages/login.js
+++ b/assets/js/pages/login.js
@@ -32,6 +32,10 @@ App.Pages.Login = (function () {
         const username = $username.val();
         const password = $password.val();
 
+        if (!username || !password) {
+            return;
+        }
+
         const $alert = $('.alert');
 
         $alert.addClass('d-none');