diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java
index 6b748ba..8477e94 100644
--- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java
+++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java
@@ -63,6 +63,7 @@ public class ArticleController {
             UserProfil user = userService.utilisateurById(article.getUtilisateur());
             Categorie cate = categorieService.findCategorieById(article.getNumCategorie());
             Retrait retrait = retraitService.retraitByNumarticle(article.getId());
+            article.setPseudoUtilisateur(user.getPseudo());
             List<Enchere> lastEnchere = this.enchereService.enchereByArticle(article.getId());
             Optional<Float> maxMontantEnchere = lastEnchere.stream()
                     .map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère
@@ -72,7 +73,9 @@ public class ArticleController {
             model.addAttribute("cate", cate.getLibelle());
             model.addAttribute("retrait", retrait);
             model.addAttribute("enchere", new Enchere());
-            model.addAttribute("maxEnchere", maxMontantEnchere.get());
+            if (maxMontantEnchere.isPresent()) {
+                model.addAttribute("maxEnchere", maxMontantEnchere.get());
+            }
             List<ObjectError> errors = (List<ObjectError>) session.getAttribute("errors");
             if (errors != null) {
                 model.addAttribute("errors", errors);
diff --git a/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java b/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
index b58d0ed..570a680 100644
--- a/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
+++ b/src/main/java/fr/eni/enchere/interceptor/UserInterceptor.java
@@ -28,7 +28,7 @@ public class UserInterceptor implements HandlerInterceptor {
             if (authentication != null && authentication.isAuthenticated() && !authentication.getName().equals("anonymousUser")) {
                 UserProfil user = this.userService.utilisateurByName(authentication.getName());
                 if (modelAndView != null && modelAndView.getViewName() != null && !modelAndView.getViewName().startsWith("redirect:")) {
-                    modelAndView.addObject("user", user.getCredit());
+                    modelAndView.addObject("user", user);
                 }
             }
         }
diff --git a/src/main/resources/templates/article.html b/src/main/resources/templates/article.html
index 48ba0a1..2c4827c 100644
--- a/src/main/resources/templates/article.html
+++ b/src/main/resources/templates/article.html
@@ -38,7 +38,7 @@
                                     </div>
                                     <div class="mt-2 d-flex flex-row align-items-end justify-content-between">
                                         <strong><label class="col-form-label">Dernière offre</label></strong>
-                                        <span th:text="${maxEnchere}"></span>
+                                        <span th:text="${maxEnchere} ? ${maxEnchere} : 'Aucune offre en cours'"></span>
                                     </div>
                                     <div class="mt-2 d-flex flex-row align-items-end justify-content-between">
                                         <strong><label class="col-form-label">Date fin enchère</label></strong>
@@ -63,7 +63,7 @@
                                     </form>
                                     <div class="mt-5">
                                         <a class="btn btn-secondary" href="/accueil" th:text="'Retour'"></a>
-<!--                                        <a th:if="${#strings.equals(${username.pseudo}, ${article.getPseudoUtilisateur()})}" class="btn btn-secondary" href="/accueil" th:text="'Modifier'"></a>-->
+                                        <a th:if="${#strings.equals(user.getPseudo(), article.pseudoUtilisateur)}" class="btn btn-secondary" href="/article/edit" th:text="'Modifier'"></a>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/resources/templates/editArticle.html b/src/main/resources/templates/editArticle.html
new file mode 100644
index 0000000..566549b
--- /dev/null
+++ b/src/main/resources/templates/editArticle.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modele-page.html b/src/main/resources/templates/modele-page.html
index d76a755..1a3cd22 100644
--- a/src/main/resources/templates/modele-page.html
+++ b/src/main/resources/templates/modele-page.html
@@ -24,7 +24,7 @@
                 <img href="/accueil" src="/img/logo.png" width="70" height="70" alt="Logo">
                 <label href="/accueil" class="text-light"><strong>ENI-Encheres</strong></label>
             </a>
-            <div th:if="${#authentication.principal != 'anonymousUser'}" class="text-light text-center d-flex justify-content-center align-items-center" th:text="#{home.credit} + ${user}"></div>
+            <div th:if="${#authentication.principal != 'anonymousUser'}" class="text-light text-center d-flex justify-content-center align-items-center" th:text="#{home.credit} + ${user.getCredit()}"></div>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>