diff --git a/login.html b/login.html
index 1514bec..fc87fc0 100644
--- a/login.html
+++ b/login.html
@@ -313,7 +313,7 @@ input:focus {
       </p>
 
 <script>
-  /*LOGIN VALIDATION*/
+/* LOGIN VALIDATION */
 document.getElementById("loginForm").addEventListener("submit", function(e) {
     e.preventDefault(); // jangan reload halaman
 
@@ -324,7 +324,7 @@ document.getElementById("loginForm").addEventListener("submit", function(e) {
     errorBox.style.display = "none";
     errorBox.innerText = "";
 
-    // Validasi form
+    // Validasi form ringan
     if (!username || !password) {
         showError("Username dan password harus diisi");
         return;
@@ -335,24 +335,22 @@ document.getElementById("loginForm").addEventListener("submit", function(e) {
         return;
     }
 
-  const usersData = localStorage.getItem("users");
-  const users = usersData ? JSON.parse(usersData) : [];
+    // Ambil data user dari localStorage
+    const usersData = localStorage.getItem("users");
+    const users = usersData ? JSON.parse(usersData) : [];
 
-  const user = users.find(u => u.username === username);
+    // Cari user berdasarkan username
+    const user = users.find(u => u.username === username);
 
-  if (!user) {
-    showError("Username tidak ditemukan");
-    return;
-  }
+    // Jika user tidak ada atau password salah
+    if (!user || user.password !== password) {
+        showError("Username atau password salah");
+        return;
+    }
 
-  if (user.password !== password) {
-    showError("Password salah");
-    return;
-  }
-
-  // Login sukses
-  localStorage.setItem("loggedInUser", JSON.stringify(user));
-  window.location.href = "mainboard.html";
+    // Login sukses
+    localStorage.setItem("loggedInUser", JSON.stringify(user));
+    window.location.href = "mainboard.html";
 });
 
 function showError(msg) {
@@ -361,13 +359,13 @@ function showError(msg) {
     errorBox.style.display = "block";
 }
 
+/* Toggle Demo */
 function toggleDemo() {
     const box = document.getElementById("demoBox");
     const btn = document.querySelector(".demo-toggle");
 
     box.classList.toggle("show");
 
-    // Ubah teks tombol
     if (box.classList.contains("show")) {
         btn.textContent = "Sembunyikan Demo Akun ▲";
     } else {
@@ -383,16 +381,11 @@ document.addEventListener("DOMContentLoaded", function () {
     for (let i = 0; i < 20; i++) {
         const g = document.createElement("div");
         g.className = "glitter";
-
-        // Random posisi ledakan glitter
         g.style.setProperty("--x", (Math.random() * 200 - 100) + "px");
         g.style.setProperty("--y", (Math.random() * 200 - 100) + "px");
-
         g.style.left = (Math.random() * 100) + "%";
         g.style.top = (Math.random() * 100) + "%";
-
         g.style.animationDelay = (Math.random() * 2) + "s";
-
         card.appendChild(g);
     }
 });
@@ -407,5 +400,6 @@ setInterval(() => {
 }, 900);
 </script>
 
+
 </body>
 </html>
\ No newline at end of file
diff --git a/login.php b/login.php
index 6c7885f..47d845e 100644
--- a/login.php
+++ b/login.php
@@ -2,24 +2,30 @@
 session_start();
 include "koneksi.php";
 
-$username = $_POST['username'];
-$password = $_POST['password'];
-
-$stmt = mysqli_prepare($conn, "SELECT * FROM user WHERE username=?");
-mysqli_stmt_bind_param($stmt, "s", $username);
-mysqli_stmt_execute($stmt);
-$result = mysqli_stmt_get_result($stmt);
-<<<<<<< HEAD
-$row = mysqli_fetch_assoc($result); 
-=======
->>>>>>> 99c33ab04fa37c4be55d5d09fec7aae16d58e08d
-
-if ($row && password_verify($password, $row['password'])) {
-    $_SESSION['username'] = $row['username'];
-    echo "OK";
-    exit;
-} else {
+if (!isset($_POST['username']) || !isset($_POST['password'])) {
     echo "Username atau password salah";
     exit;
 }
+
+$username = $_POST['username'];
+$password = $_POST['password'];
+
+// Ambil user berdasarkan username
+$stmt = mysqli_prepare($conn, "SELECT * FROM user WHERE username=?");
+mysqli_stmt_bind_param($stmt, "s", $username);
+mysqli_stmt_execute($stmt);
+
+$result = mysqli_stmt_get_result($stmt);
+$row = mysqli_fetch_assoc($result);
+
+// Kalau username tidak ditemukan ATAU password salah
+if (!$row || !password_verify($password, $row['password'])) {
+    echo "Username atau password salah";
+    exit;
+}
+
+// Login sukses
+$_SESSION['username'] = $row['username'];
+echo "OK";
+exit;
 ?>