diff --git a/src/app/controllers/AuthController.php b/src/app/controllers/AuthController.php
new file mode 100644
index 0000000..a719352
--- /dev/null
+++ b/src/app/controllers/AuthController.php
@@ -0,0 +1,130 @@
+<?php
+
+require_once __DIR__ . '/../models/Account.php';
+
+class AuthController {
+    private $accountModel;
+
+    public function __construct(PDO $dbConnection) {
+        $this->accountModel = new Account($dbConnection);
+    }
+
+    public function viewSignUp() {
+        $title = 'Sign Up';
+        require_once __DIR__ . '/../views/sign-up.php';
+    }
+
+    public function viewSignIn() {
+        $title = 'Sign In';
+        require_once __DIR__ . '/../views/sign-in.php';
+    }
+
+    public function viewAccount() {
+        if (!isset($_SESSION['user_id'])) {
+            header('Location: /sign-in');
+            exit;
+        }
+
+        $title = 'My account';
+        require_once __DIR__ . '/../views/account.php';
+    }
+
+    public function signUp() {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            header('Location: /sign-up');
+            exit;
+        }
+
+        $firstName = trim($_POST["first_name"] ?? '') ;
+        $lastName = trim($_POST["last_name"] ?? '');
+        $phone = !empty($_POST["phone"]) ? trim($_POST["phone"]) : null;
+        $email = trim($_POST["email"] ?? '');
+        $password = trim($_POST["password"] ?? '');
+        $conPassword = trim($_POST["confirm_password"] ?? '');
+
+        $errors = [];
+
+        if (empty($firstName) || empty($lastName) || empty($email) || empty($password) || empty($conPassword)) {
+            $_SESSION['errors'] = ["Please fill in all the fields."];
+            header('Location: /sign-up');
+            exit;
+        }
+
+        if ($this->accountModel->findByEmail($email)) {
+            $_SESSION['errors'] = ["Email already exists."];
+            header('Location: /sign-up');
+            exit;
+        }
+
+        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) $errors[] = "Valid email is required.";
+        if (strlen($password) < 6) $errors[] = "Password must be at least 6 characters.";
+        if ($password !== $conPassword) $errors[] = "Passwords do not match.";
+
+        if (!empty($errors)) {
+            $_SESSION['errors'] = $errors;
+            header('Location: /sign-up');
+            exit;
+        }
+
+        if ($this->accountModel->create($firstName, $lastName, $email, $phone, $password)) {
+            $_SESSION['success'] = "Account created successfully!";
+            header('Location: /sign-in');
+            exit;
+        }
+
+        $_SESSION['errors'] = ["Error creating account!"];
+        header('Location: /sign-up');
+        exit;
+    }
+
+    public function signIn() {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+            header('Location: /sign-in');
+            exit;
+        }
+
+        $email = trim($_POST['email'] ?? '');
+        $password = trim($_POST['password'] ?? '');
+
+        $user = $this->accountModel->findByEmail($email);
+
+        if ($user && password_verify($password, $user['password'])) {
+            $_SESSION['user_id'] = $user['id'];
+            $_SESSION['user_first_name'] = $user['first_name'];
+            $_SESSION['user_last_name'] = $user['last_name'];
+            $_SESSION['user_email'] = $user['email'];
+            header('Location: /account');
+            exit;
+        }
+
+        $_SESSION['errors'] = ["Invalid email or password."];
+        header('Location: /sign-in');
+        exit;
+    }
+
+    public function signOut() {
+        $_SESSION = [];
+        session_destroy();
+        header('Location: /');
+        exit;
+    }
+
+    public function getAccountData() {
+        header('Content-Type: application/json');
+
+        if (!isset($_SESSION['user_id'])) {
+            http_response_code(401);
+            echo json_encode(['error' => 'Access denied.']);
+            exit;
+        }
+
+        $data = [
+            'first_name' => $_SESSION['user_first_name'] ?? '',
+            'last_name'  => $_SESSION['user_last_name'] ?? '',
+            'email'      => $_SESSION['user_email'] ?? ''
+        ];
+
+        echo json_encode($data);
+        exit;
+    }
+}
\ No newline at end of file
diff --git a/src/app/controllers/HomeController.php b/src/app/controllers/HomeController.php
index 5247f8e..807a910 100644
--- a/src/app/controllers/HomeController.php
+++ b/src/app/controllers/HomeController.php
@@ -3,16 +3,4 @@ class HomeController {
     public function home() {
         require_once __DIR__ . '/../views/home.php';
     }
-
-    public function viewSignIn() {
-        require_once __DIR__ . '/../views/sign-in.php';
-    }
-
-    public function viewSignUp() {
-        require_once __DIR__ . '/../views/sign-up.php';
-    }
-
-    public function viewAccount() {
-        require_once __DIR__ . '/../views/account_view.php';
-    }
 }
\ No newline at end of file
diff --git a/src/app/controllers/TestController.php b/src/app/controllers/TestController.php
deleted file mode 100644
index 637c48a..0000000
--- a/src/app/controllers/TestController.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-require_once __DIR__ . '/../models/TestModel.php';
-
-class TestController {
-    public function test() {
-        $title = "This is a test!";
-        $testModel = new TestModel();
-        require __DIR__ . '/../views/test.php';
-    }
-
-    public function test2() {
-        $title = "This is another test!";
-        $testModel = new TestModel();
-        require __DIR__ . '/../views/test.php';
-    }
-}
\ No newline at end of file
diff --git a/src/app/controllers/sign-in.php b/src/app/controllers/sign-in.php
index e6a4d01..5feea38 100644
--- a/src/app/controllers/sign-in.php
+++ b/src/app/controllers/sign-in.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ .'/../models/account.php';
+require __DIR__ . '/../models/Account.php';
 require __DIR__ .'/../../config/database.php';
 
 $email = $_REQUEST["email"];
diff --git a/src/app/controllers/sign-up.php b/src/app/controllers/sign-up.php
deleted file mode 100644
index 836e12f..0000000
--- a/src/app/controllers/sign-up.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-require __DIR__ .'/../models/account.php';
-require __DIR__ .'/../../config/database.php';
-
-$first_name = $_REQUEST["first_name"];
-$last_name = $_REQUEST["last_name"];
-$phone = $_REQUEST["phone"];
-$email = $_REQUEST["email"];
-$password = $_REQUEST["password"];
-
-if (
-    empty($_POST["first_name"]) ||
-    empty($_POST["last_name"]) ||
-    empty($_POST["phone"]) ||
-    empty($_POST["email"]) ||
-    empty($_POST["password"])) {
-    http_response_code(400);
-    header('Location: /sign-up?error=1');
-}
-
-$query = getConnection()->prepare('INSERT INTO account (first_name, last_name, phone, email, password, date_creation, role) VALUES (?, ?, ?, ?, ?, ?, ?)');
-$query->execute([$first_name, $last_name, $phone, $email, password_hash($password, PASSWORD_DEFAULT), date("Y-m-d"), 1]);
-
-header('Location: /sign-in');
\ No newline at end of file
diff --git a/src/app/models/Account.php b/src/app/models/Account.php
new file mode 100644
index 0000000..108c4c9
--- /dev/null
+++ b/src/app/models/Account.php
@@ -0,0 +1,34 @@
+<?php
+class Account {
+    private $conn;
+
+    public function __construct(PDO $dbConnection) {
+        $this->conn = $dbConnection;
+    }
+
+    public function create($firstName, $lastName, $email, $phone, $password) {
+        $hashedPassword = password_hash($password, PASSWORD_DEFAULT);
+
+        $query = "INSERT INTO account (first_name, last_name, email, phone, password) 
+        VALUES (:firstName, :lastName, :email, :phone, :password)";
+
+        $stmt = $this->conn->prepare($query);
+        $stmt->bindValue(':firstName', $firstName);
+        $stmt->bindValue(':lastName', $lastName);
+        $stmt->bindValue(':email', $email);
+        $stmt->bindValue(':phone', $phone);
+        $stmt->bindValue(':password', $hashedPassword);
+
+        return $stmt->execute();
+    }
+
+    public function findByEmail($email) {
+        $query = "SELECT * FROM account WHERE email = :email";
+
+        $stmt = $this->conn->prepare($query);
+        $stmt->bindValue(':email', $email);
+        $stmt->execute();
+
+        return $stmt->fetch(PDO::FETCH_ASSOC);
+    }
+}
\ No newline at end of file
diff --git a/src/app/models/TestModel.php b/src/app/models/TestModel.php
deleted file mode 100644
index 57545fd..0000000
--- a/src/app/models/TestModel.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-require_once __DIR__ . '/../../config/database.php';
-
-class TestModel {
-    private $conn;
-
-    public function __construct() {
-        $database = new Database();
-        $this->conn = $database->getConnection();
-    }
-
-    public function getStatus() {
-        if ($this->conn) {
-            echo "Database connection: Success";
-        } else {
-            echo "Error with connection";
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/app/models/account.php b/src/app/models/account.php
deleted file mode 100644
index fa43067..0000000
--- a/src/app/models/account.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class Account
-{
-    public $id;
-    public $first_name;
-    public $last_name;
-    public $email;
-    public $phone;
-    public $password;
-    public $date_creation;
-    public $role_id;
-}
-
-?>
diff --git a/src/app/views/account.php b/src/app/views/account.php
new file mode 100644
index 0000000..24d676b
--- /dev/null
+++ b/src/app/views/account.php
@@ -0,0 +1,53 @@
+<?php include 'partials/header.php'; ?>
+
+<main>
+    <h1>My account</h1>
+
+    <div id="loading">Loading account information...</div>
+    <!-- Sensitive information are not displayed until server is sure user is authenticated -->
+    <div id="account-content" style="display: none;">
+        <div class="account-details">
+            <div>
+                <label>First name</label>
+                <p id="user-first-name"></p>
+            </div>
+            <div>
+                <label>Last name</label>
+                <p id="user-last-name"></p>
+            </div>
+            <div>
+                <label>Email</label>
+                <p id="user-email"></p>
+            </div>
+        </div>
+    </div>
+</main>
+
+<script>
+    fetch('/account-data')
+        .then(response => {
+            // Session has been lost
+            if (response.status === 401) {
+                window.location.href = '/sign-in';
+                return;
+            }
+
+            return response.json();
+        })
+        .then(data => {
+            if (data && !data.error) {
+                document.getElementById('user-first-name').textContent = data.first_name;
+                document.getElementById('user-last-name').textContent = data.last_name;
+                document.getElementById('user-email').textContent = data.email;
+
+                document.getElementById('loading').style.display = 'none';
+                document.getElementById('account-content').style.display = 'block';
+            }
+        })
+        .catch(err => {
+            // Redirect if network issue
+            window.location.href = '/sign-in';
+        });
+</script>
+
+<?php include 'partials/footer.php'; ?>
diff --git a/src/app/views/account_view.php b/src/app/views/account_view.php
deleted file mode 100644
index f568932..0000000
--- a/src/app/views/account_view.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php include 'partials/header.php'; ?>
-
-<?php $account = $_SESSION['account']; ?>
-<div>
-    <h1>Mon compte</h1>
-    <div class="account-details">
-        <div>
-            <label>Prénom</label>
-            <p><?= $account->first_name ?></p>
-        </div>
-        <div>
-            <label>Nom</label>
-            <p><?= $account->last_name ?></p>
-        </div>
-        <div>
-            <label>Adresse mail</label>
-            <p><?= $account->email ?></p>
-        </div>
-        <div>
-            <label>Téléphone</label>
-            <p><?= $account->phone ?></p>
-        </div>
-        <div>
-            <label>Date de création</label>
-            <p><?= $account->date_creation ?></p>
-        </div>
-    </div>
-</div>
-
-<?php include 'partials/footer.php'; ?>
diff --git a/src/app/views/partials/footer.php b/src/app/views/partials/footer.php
index 691287b..19b0eb9 100644
--- a/src/app/views/partials/footer.php
+++ b/src/app/views/partials/footer.php
@@ -1,2 +1,5 @@
-</body>
+    </body>
+    <footer>
+        This is a <strong>F O O T E R</strong>
+    </footer>
 </html>
\ No newline at end of file
diff --git a/src/app/views/partials/header.php b/src/app/views/partials/header.php
index 9dc865c..925980b 100644
--- a/src/app/views/partials/header.php
+++ b/src/app/views/partials/header.php
@@ -1,9 +1,10 @@
-<html lang="fr">
+<!DOCTYPE html>
+<html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title><?php echo isset($title) ? $title : "EFES KEBAB"; ?></title></head>
+    <title><?php echo isset($title) ? $title : "EFES KEBAB"; ?></title>
+</head>
+
 <body>
-<?php include 'navbar.php'; 
-  // [FIXME] Or might be also 'nav.php'
-  ?>
+<?php include 'navbar.php'; ?>
diff --git a/src/app/views/partials/nav.php b/src/app/views/partials/nav.php
deleted file mode 100644
index a72ca70..0000000
--- a/src/app/views/partials/nav.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require __DIR__ . '/../../models/account.php';
-
-session_start();
-if (!isset($_SESSION['account'])) {
-    $account = null;
-} else {
-    $account = $_SESSION['account'];
-}
-?>
-<nav>
-<!--TODO : this file may be deleted since it has been implemented in navbar.php-->
-</nav>
diff --git a/src/app/views/partials/navbar.php b/src/app/views/partials/navbar.php
index 9f5685f..dba8dde 100644
--- a/src/app/views/partials/navbar.php
+++ b/src/app/views/partials/navbar.php
@@ -1,24 +1,22 @@
 <?php
-require __DIR__ . '/../../models/account.php';
-
-if (!isset($_SESSION['account'])) {
-    $account = null;
-} else {
-    $account = $_SESSION['account'];
-}
+    $userId = null;
+    if (isset($_SESSION['user_id'])) {
+        $userId = $_SESSION['user_id'];
+    }
 ?>
 
 <nav class="navbar">
     <div class="container">
         <ul class="pages-list">
             <li><a href="/">Home</a></li>
-            <?php if ($account) { ?>
-                <li><a href="#">Commander</a></li>
-                <li><a href="/account">Mon compte</a></li>
-                <li><a href="/basket">Mon panier</a></li>
+            <?php if ($userId) { ?>
+                <li><a href="#">Order</a></li>
+                <li><a href="/account">My account</a></li>
+                <li><a href="/basket">Cart</a></li>
+                <li><a href="/sign-out">Sign out</a></li>
             <?php } else { ?>
-                <li><a href="/sign-in">Sign-in</a></li>
-                <li><a href="/sign-up">Sign-up</a></li>
+                <li><a href="/sign-in">Sign in</a></li>
+                <li><a href="/sign-up">Sign up</a></li>
             <?php } ?>
         </ul>
     </div>
diff --git a/src/app/views/sign-in.php b/src/app/views/sign-in.php
index 1677096..69e2776 100644
--- a/src/app/views/sign-in.php
+++ b/src/app/views/sign-in.php
@@ -1,16 +1,41 @@
 <?php include 'partials/header.php'; ?>
-<div>
+
+<main>
     <h1>Sign in</h1>
-    <form action="../controllers/sign-in.php" method="post">
+
+    <?php if (isset($_SESSION['errors'])): ?>
+        <div>
+            <?php foreach ($_SESSION['errors'] as $error): ?>
+                <p><?= htmlspecialchars($error) ?></p>
+            <?php endforeach; ?>
+        </div>
+
+        <?php unset($_SESSION['errors']); ?>
+    <?php endif; ?>
+
+    <?php if (isset($_SESSION['success'])): ?>
+        <div>
+            <p><?= htmlspecialchars($_SESSION['success']) ?></p>
+        </div>
+
+        <?php unset($_SESSION['success']); ?>
+    <?php endif; ?>
+
+    <form method="POST" action="/sign-in">
         <div>
             <label for="email">Email address</label>
             <input type="email" id="email" name="email" placeholder="you@example.com" required>
         </div>
+
         <div>
             <label for="password">Password</label>
             <input type="password" id="password" name="password" placeholder="Enter your password" required>
         </div>
+
         <button type="submit">Sign in</button>
     </form>
-</div>
+
+    <p>Don't have an account? <a href="/sign-up">Sign Up</a></p>
+</main>
+
 <?php include 'partials/footer.php'; ?>
diff --git a/src/app/views/sign-up.php b/src/app/views/sign-up.php
index db1c55f..b83c836 100644
--- a/src/app/views/sign-up.php
+++ b/src/app/views/sign-up.php
@@ -1,35 +1,55 @@
 <?php include 'partials/header.php'; ?>
-<div>
+
+<main>
     <h1>Sign up</h1>
-    <form action="../controllers/sign-up.php" method="post">
+
+    <!-- Print errors if any have been made during the POST sign up process -->
+    <?php if (isset($_SESSION['errors'])): ?>
         <div>
-            <div>
-                <label for="first_name">First name</label>
-                <input type="text" id="first_name" name="first_name" placeholder="John" required>
-            </div>
-            <div>
-                <label for="last_name">Last name</label>
-                <input type="text" id="last_name" name="last_name" placeholder="Doe" required>
-            </div>
+            <?php foreach ($_SESSION['errors'] as $error): ?>
+                <p><?= htmlspecialchars($error) ?></p>
+            <?php endforeach; ?>
         </div>
+
+        <?php unset($_SESSION['errors']); ?>
+    <?php endif; ?>
+
+    <form method="POST" action="/sign-up">
+        <div>
+            <label for="first_name">First name</label>
+            <input type="text" id="first_name" name="first_name" placeholder="John" required>
+        </div>
+
+        <div>
+            <label for="last_name">Last name</label>
+            <input type="text" id="last_name" name="last_name" placeholder="Doe" required>
+        </div>
+
         <div>
             <!-- TODO: Add country prefix ? auto spacing ? -->
             <label for="phone">Phone number</label>
-            <input type="number" id="phone" name="phone" required>
+            <input type="number" id="phone" name="phone">
         </div>
+
         <div>
             <label for="email">Email address</label>
             <input type="email" id="email" name="email" placeholder="you@example.com" required>
         </div>
+
         <div>
             <label for="password">Password</label>
             <input type="password" id="password" name="password" placeholder="Create a password" required>
         </div>
+
         <div>
             <label for="confirm_password">Confirm password</label>
             <input type="password" id="confirm_password" name="confirm_password" placeholder="Repeat your password" required>
         </div>
+
         <button type="submit">Create account</button>
     </form>
-</div>
-<?php include 'partials/footer.php'; ?>
+
+    <p>Already have an account? <a href="/sign-in">Sign In</a></p>
+</main>
+
+<?php include 'partials/footer.php'; ?>
\ No newline at end of file
diff --git a/src/app/views/test.php b/src/app/views/test.php
deleted file mode 100644
index 0af61de..0000000
--- a/src/app/views/test.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <title><?= htmlspecialchars($title) ?></title>
-    </head>
-
-    <body>
-        <h1><?= $title ?></h1>
-        <p><?= $testModel->getStatus(); ?></p>
-    </body>
-</html>
\ No newline at end of file
diff --git a/src/public/index.php b/src/public/index.php
index f8fd481..1c817d1 100644
--- a/src/public/index.php
+++ b/src/public/index.php
@@ -1,5 +1,11 @@
 <?php
 
+session_start();
+
+require_once __DIR__ . '/../config/database.php';
+$database = new Database();
+$dbConnection = $database->getConnection();
+
 $routes = require_once __DIR__ . "/../routes/web.php";
 
 function normalize_path($path) {
@@ -23,7 +29,7 @@ function normalize_path($path) {
     if (file_exists($controllerFile)) {
         require_once $controllerFile;
 
-        $controller = new $controllerName();
+        $controller = new $controllerName($dbConnection);
         if (method_exists($controller, $controllerAction)) {
             $controller->$controllerAction();
         } else {
diff --git a/src/routes/web.php b/src/routes/web.php
index f85cad4..0518c2b 100644
--- a/src/routes/web.php
+++ b/src/routes/web.php
@@ -1,12 +1,15 @@
 <?php
 return [
     'GET' => [
-        '/'             => ['HomeController', 'home'],
-        '/sign-in'      => ['HomeController', 'viewSignIn'],
-        '/sign-up'      => ['HomeController', 'viewSignUp'],
-        '/account'      => ['HomeController', 'viewAccount'],
+        '/'                 => ['HomeController', 'home'],
+        '/sign-in'          => ['AuthController', 'viewSignIn'],
+        '/sign-up'          => ['AuthController', 'viewSignUp'],
+        '/sign-out'         => ['AuthController', 'signOut'],
+        '/account'          => ['AuthController', 'viewAccount'],
+        '/account-data'     => ['AuthController', 'getAccountData'],
     ],
     'POST' => [
-
+        '/sign-in'          => ['AuthController', 'signIn'],
+        '/sign-up'          => ['AuthController', 'signUp'],
     ],
 ];
\ No newline at end of file