diff --git a/build.gradle b/build.gradle
index 9efb562..aac6324 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.3.RELEASE'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework:spring-jdbc'
 	implementation 'org.flywaydb:flyway-core:11.3.2'
diff --git a/src/main/java/com/bernard/misael/ThymeleafConfig.java b/src/main/java/com/bernard/misael/ThymeleafConfig.java
new file mode 100644
index 0000000..9611512
--- /dev/null
+++ b/src/main/java/com/bernard/misael/ThymeleafConfig.java
@@ -0,0 +1,14 @@
+package com.bernard.misael;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
+
+@Configuration
+public class ThymeleafConfig {
+
+    @Bean
+    public SpringSecurityDialect springSecurityDialect(){
+        return new SpringSecurityDialect();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/bernard/misael/web/AuthController.java b/src/main/java/com/bernard/misael/web/AuthController.java
index 6945037..f262a0f 100644
--- a/src/main/java/com/bernard/misael/web/AuthController.java
+++ b/src/main/java/com/bernard/misael/web/AuthController.java
@@ -43,13 +43,7 @@ public class AuthController {
 
     @GetMapping("/")
     public String index(Model model) {
-        if(SecurityContextHolder.getContext().getAuthentication().getPrincipal() instanceof org.springframework.security.core.userdetails.User){
-            org.springframework.security.core.userdetails.User user
-                 = (org.springframework.security.core.userdetails.User)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-            model.addAttribute("username", user.getUsername());
-        }else{
-            model.addAttribute("username", "no-one");
-        }
+        
         return "index";
     }
 
diff --git a/src/main/java/com/bernard/misael/web/QuestionsController.java b/src/main/java/com/bernard/misael/web/QuestionsController.java
index 54e3362..f2a0487 100644
--- a/src/main/java/com/bernard/misael/web/QuestionsController.java
+++ b/src/main/java/com/bernard/misael/web/QuestionsController.java
@@ -1,12 +1,8 @@
 package com.bernard.misael.web;
 
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import com.bernard.misael.service.dto.UserDto;
-
 import org.springframework.web.bind.annotation.GetMapping;
 
 
@@ -21,6 +17,7 @@ public class QuestionsController {
     public String getQuizz() {
         return "quizz.html";
     }
+    
     @GetMapping("/forms")
     /*
      * List all forms started or finished by the user
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 5461ba8..658a11f 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -50,6 +50,7 @@ main{
   justify-content: center;
   color: #96c7e8;
   font-size: 24px;
+  flex-direction: column;
 }
 .button a{
   position: fixed;
@@ -61,4 +62,15 @@ main{
   font-size: 18px;
   border-radius: 6px;
   box-shadow: rgba(0, 0, 0, 0.15);
+}
+div.alert {
+  background: #FFDDEE;
+  font-size: 20px;
+  font-style: italic;
+}
+
+div.welcome{
+  color: #fff;
+  font-size: 20px;
+  font-style: italic;
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/header.html b/src/main/resources/templates/header.html
index 85bcf13..cfa56e8 100644
--- a/src/main/resources/templates/header.html
+++ b/src/main/resources/templates/header.html
@@ -1,10 +1,13 @@
 <nav>
     <div class="navbar">
-        <div class="logo"><a href="#">Misael-Q</a></div>
+        <div class="logo"><a href="/">Misael</a></div>
+        <div class="welcome" sec:authorize="isAuthenticated()">Logged in as <span sec:authentication="name"/></div>
         <ul class="menu">
             <li><a href="/questions/quizz">Quizz</a></li>
             <li><a href="/questions/forms">Forms</a></li>
-            <li><a href="/login">Login</a></li>
+            <li sec:authorize="isAnonymous()"><a href="/login">Log in</a></li>
+            <li sec:authorize="isAuthenticated()"><a href="/logout">Log out</div></a></li>
+          
         </ul>
     </div>
 </nav>
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 3ef592c..391d708 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -7,7 +7,7 @@
 <body>
     <div th:replace="~{header}"/>
     <main>
-        Logged in as <div th:text="${username}"></div>
+        Youhou ! (Y a rien ici)
     </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 2706e8a..a648950 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -25,7 +25,7 @@
             <label for="password">Mot de passe :</label>
             <input type="password" id="password" name="password"/>
             <br/>
-            <input id="connect" type="submit">Se connecter</input>
+            <input id="connect" type="submit" value="Se connecter"/>
         </form>
     </main>
 </body>