diff --git a/includes/signin.php b/includes/signin.php
index 1f529feefd6fafa7b898ab04d8eed34e31156615..062e848121c338a265f926311143b5821c98d8d0 100644
--- a/includes/signin.php
+++ b/includes/signin.php
@@ -1,52 +1,60 @@
 <?php
 session_start();
-if(isset($_POST['signin']))
-{
-$email=$_POST['email'];
-$password = $_POST['password'];
-$sql = "SELECT EmailId, Password FROM tblusers WHERE EmailId=:email";
-$query = $dbh->prepare($sql);
-$query->bindParam(':email', $email, PDO::PARAM_STR);
-$query->execute();
-$result = $query->fetch(PDO::FETCH_ASSOC);
-
-if ($result && password_verify($password, $result['Password'])) {
-    $_SESSION['login'] = $email;
-    echo "<script type='text/javascript'> document.location = 'package-list.php'; </script>";
+include('db_config.php');  // เชื่อมต่อฐานข้อมูล
+
+if (isset($_POST['signin'])) {
+    $email = $_POST['email'];
+    $password = $_POST['password'];
+
+    // ใช้ password_hash() กับฐานข้อมูลที่เก็บรหัสผ่าน
+    $sql = "SELECT EmailId, Password FROM tblusers WHERE EmailId = :email";
+    $query = $dbh->prepare($sql);
+    $query->bindParam(':email', $email, PDO::PARAM_STR);
+    $query->execute();
+
+    $result = $query->fetch(PDO::FETCH_ASSOC);
+
+    if ($result && password_verify($password, $result['Password'])) {
+        $_SESSION['login'] = $email;  // เก็บข้อมูลผู้ใช้ที่ล็อกอิน
+        header("Location: package-list.php");  // ไปที่หน้าต่อไป
+    } else {
+        echo "<script>alert('Invalid Details');</script>";
+    }
+}
+
+if (!isset($_SESSION['login'])) {
+    echo "Please login first.";
 } else {
-    echo "<script>alert('Invalid Details');</script>";
+    echo "Welcome, " . $_SESSION['login'];
 }
 
+?>
 
-}
+<?php
+session_start();
 
+// ลบ Session ที่เก็บข้อมูลผู้ใช้
+session_unset();  
+session_destroy();  
+
+// ส่งผู้ใช้กลับไปที่หน้า Login
+header("Location: signin.php");
+exit();
 ?>
 
-<div class="modal fade" id="myModal4" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-				<div class="modal-dialog" role="document">
-					<div class="modal-content modal-info">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>						
-						</div>
-						<div class="modal-body modal-spa">
-							<div class="login-grids">
-								<div class="login">
-										
-									<div class="login-right">
-										<form method="post">
-											<h3>Signin with your account </h3>
-	<input type="text" name="email" id="email" placeholder="Enter your Email"  required="">	
-	<input type="password" name="password" id="password" placeholder="Password" value="" required="">	
-											<h4><a href="forgot-password.php">Forgot password</a></h4>
-											
-											<input type="submit" name="signin" value="SIGNIN">
-										</form>
-									</div>
-									<div class="clearfix"></div>								
-								</div>
-								<p>By logging in you agree to our <a href="page.php?type=terms">Terms and Conditions</a> and <a href="page.php?type=privacy">Privacy Policy</a></p>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
\ No newline at end of file
+
+
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Sign In</title>
+</head>
+<body>
+    <form method="post">
+        <h3>Signin with your account</h3>
+        <input type="text" name="email" placeholder="Enter your Email" required><br>
+        <input type="password" name="password" placeholder="Password" required><br>
+        <input type="submit" name="signin" value="SIGN IN"><br>
+    </form>
+</body>
+</html>
diff --git a/includes/signup.php b/includes/signup.php
index f993f6d7c2822c9ce170b4514867c61d8f593171..0b35a464253b2b0438aa7123e6fbe79731ce6b5b 100644
--- a/includes/signup.php
+++ b/includes/signup.php
@@ -42,6 +42,21 @@ $("#loaderIcon").hide();
 error:function (){}
 });
 }
+
+if (isset($_POST['register'])) {
+    $email = $_POST['email'];
+    $password = $_POST['password'];
+
+    // เข้ารหัสรหัสผ่าน
+    $hashed_password = password_hash($password, PASSWORD_DEFAULT);
+
+    $sql = "INSERT INTO tblusers (EmailId, Password) VALUES (:email, :password)";
+    $query = $dbh->prepare($sql);
+    $query->bindParam(':email', $email, PDO::PARAM_STR);
+    $query->bindParam(':password', $hashed_password, PDO::PARAM_STR);
+    $query->execute();
+}
+
 </script>
 
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
diff --git a/package-list.php b/package-list.php
index 08e0770da765e5285f09a1a38ce51eb6276eb48e..8f8ec148bcf467ec43aaf38f159ddf4a1d2e8988 100644
--- a/package-list.php
+++ b/package-list.php
@@ -91,4 +91,18 @@ foreach($results as $result)
 <?php include('includes/write-us.php');?>			
 <!-- //write us -->
 </body>
-</html>
\ No newline at end of file
+</html>
+
+<?php
+session_start();
+
+// ถ้าผู้ใช้ไม่ได้เข้าสู่ระบบ ให้ส่งกลับไปที่หน้า login
+if (!isset($_SESSION['login'])) {
+    header("Location: signin.php");
+    exit();
+}
+
+// ถ้ามีการเข้าสู่ระบบแล้ว
+echo "Welcome, " . $_SESSION['login'];  // แสดงชื่อผู้ใช้ที่ล็อกอิน
+?>
+<a href="logout.php">Log Off</a>