diff --git a/account.php b/account.php
index ee0fad8..39c4bea 100644
--- a/account.php
+++ b/account.php
@@ -25,16 +25,16 @@ if ($result === false) {
         <div id="logo" style="font-size: 24px; font-weight: bold;"><a href="index.php"><img src="img/logo.png" alt="Logo TechStore" height="32px"></a></div>
         <div>
             <a href="cart.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer;">Carrello</button></a>
-            <?php if (isset($_SESSION['user'])): ?>
+            <?php if (isset($_SESSION['name'])): ?>
                 <a href="logout.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #dc3545; color: white; border: none; border-radius: 4px; cursor: pointer;">Logout</button></a>
-                <span style="margin-left: 10px;">Benvenuto, <?php echo htmlspecialchars($_SESSION['user']); ?></span>
+                <span style="margin-left: 10px;">Benvenuto, <?php echo htmlspecialchars($_SESSION['name']); ?></span>
             <?php else: ?>
                 <a href="login.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #28a745; color: white; border: none; border-radius: 4px; cursor: pointer;">Accesso</button></a>
             <?php endif; ?>
         </div>
     </header>
 
-    <?php if (isset($_SESSION['user'])): ?>
+    <?php if (isset($_SESSION['name'])): ?>
         <div class="account-layout">
             <div class="my-sidebar">
                 <ul>
diff --git a/cart.php b/cart.php
index eb6fd1d..4810016 100644
--- a/cart.php
+++ b/cart.php
@@ -16,9 +16,9 @@ session_start();
         <div id="logo" style="font-size: 24px; font-weight: bold;"><a href="index.php"><img src="img/logo.png" alt="Logo TechStore" height="32px"></a></div>
         <div>
             <a href="cart.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer;">Carrello</button></a>
-            <?php if (isset($_SESSION['user'])): ?>
+            <?php if (isset($_SESSION['name'])): ?>
                 <a href="logout.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #dc3545; color: white; border: none; border-radius: 4px; cursor: pointer;">Logout</button></a>
-                <span style="margin-left: 10px;">Benvenuto, <a href="account.php"><?php echo htmlspecialchars($_SESSION['user']); ?></a></span>
+                <span style="margin-left: 10px;">Benvenuto, <a href="account.php"><?php echo htmlspecialchars($_SESSION['name']); ?></a></span>
             <?php else: ?>
                 <a href="login.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #28a745; color: white; border: none; border-radius: 4px; cursor: pointer;">Accesso</button></a>
             <?php endif; ?>
diff --git a/index.php b/index.php
index b6c7007..c44cc25 100644
--- a/index.php
+++ b/index.php
@@ -25,9 +25,9 @@ if ($result === false) {
         <div id="logo"><img src="img/logo.png" alt="Logo TechStore" height="32px"></div>
         <div>
             <a href="cart.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer;">Carrello</button></a>
-            <?php if (isset($_SESSION['user'])): ?>
+            <?php if (isset($_SESSION['name'])): ?>
                 <a href="logout.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #dc3545; color: white; border: none; border-radius: 4px; cursor: pointer;">Logout</button></a>
-                <span style="margin-left: 10px;">Benvenuto, <a href="account.php"><?php echo htmlspecialchars($_SESSION['user']); ?></a></span>
+                <span style="margin-left: 10px;">Benvenuto, <a href="account.php"><?php echo htmlspecialchars($_SESSION['name']); ?></a></span>
             <?php else: ?>
                 <a href="login.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #28a745; color: white; border: none; border-radius: 4px; cursor: pointer;">Accesso</button></a>
             <?php endif; ?>
diff --git a/login.php b/login.php
index c6e7a10..61b34e2 100644
--- a/login.php
+++ b/login.php
@@ -17,19 +17,20 @@
             $email = $_POST['email'];
             $password = $_POST['password'];
             
-            $sql = "SELECT UserID, Name, Password, Role FROM Users WHERE Email = ?";
+            $sql = "SELECT UserID, Name, Surname, Password, Role FROM Users WHERE Email = ?";
             if ($stmt = $conn->prepare($sql)) {
                 $stmt->bind_param("s", $email);
                 $stmt->execute();
                 $stmt->store_result();
                 
                 if ($stmt->num_rows > 0) {
-                    $stmt->bind_result($user_id, $name, $hashed_password, $role);
+                    $stmt->bind_result($user_id, $name, $surname, $hashed_password, $role);
                     $stmt->fetch();
                     
                     if (password_verify($password, $hashed_password)) {
                         $_SESSION['id'] = $user_id;
-                        $_SESSION['user'] = $name;
+                        $_SESSION['name'] = $name;
+                        $_SESSION['surname'] = $surname;
                         $_SESSION['role'] = $role;
                         header('Location: index.php');
                         exit();
diff --git a/product.php b/product.php
index 7205975..6d4d764 100644
--- a/product.php
+++ b/product.php
@@ -36,9 +36,9 @@ if ($stmt = $conn->prepare($sql)) {
         <div id="logo" style="font-size: 24px; font-weight: bold;"><a href="index.php"><img src="img/logo.png" alt="Logo TechStore" height="32px"></a></div>
         <div>
             <a href=""><button style="margin-left: 10px; padding: 8px 16px; background-color: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer;">Carrello</button></a>
-            <?php if (isset($_SESSION['user'])): ?>
+            <?php if (isset($_SESSION['name'])): ?>
                 <a href="logout.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #dc3545; color: white; border: none; border-radius: 4px; cursor: pointer;">Logout</button></a>
-                <span style="margin-left: 10px;">Benvenuto, <a href="account.php"><?php echo htmlspecialchars($_SESSION['user']); ?></a></span>
+                <span style="margin-left: 10px;">Benvenuto, <a href="account.php"><?php echo htmlspecialchars($_SESSION['name']); ?></a></span>
             <?php else: ?>
                 <a href="login.php"><button style="margin-left: 10px; padding: 8px 16px; background-color: #28a745; color: white; border: none; border-radius: 4px; cursor: pointer;">Accesso</button></a>
             <?php endif; ?>