diff --git a/app/controllers/user.controller.js b/app/controllers/user.controller.js
index feb6130..9fc2e39 100644
--- a/app/controllers/user.controller.js
+++ b/app/controllers/user.controller.js
@@ -3,7 +3,7 @@ exports.allAccess = (req, res) => {
   };
   
   exports.userBoard = (req, res) => {
-    res.status(200).send("bienvenue "+req.userId);
+    res.status(200).send({ message: "bienvenue "+req.userId });
     console.log(req.userId);
   };
   
diff --git a/public/assets/js/site.js b/public/assets/js/site.js
index 8ab11df..f596ebe 100644
--- a/public/assets/js/site.js
+++ b/public/assets/js/site.js
@@ -251,9 +251,11 @@ jQuery(function($) {
 
   // connexion shizzle 
 
+  let wrongpass;
+
   function logout(){
     Cookies.remove("x-access-token");
-    window.location.reload();
+    connOOF();
   }
 
   function checkLoggedin(){
@@ -269,15 +271,16 @@ jQuery(function($) {
       xhr.setRequestHeader("x-access-token", Cookies.get("x-access-token"));
       xhr.send(params);
       xhr.onload = () => {
-        const data = xhr.responseText
-        document.querySelector("#mainbj #reg_status").innerHTML = data
+        console.log(xhr.responseText)
+        const data = JSON.parse(xhr.responseText)
+        document.querySelector("#mainbj #reg_status").innerHTML = data.message
       }
     }
   }
 
   function checkLogin(value){
 
-    function checkPass(s1,s2){
+    function checkRegPass(s1,s2){
       if (s1==s2){
         return s1
       }
@@ -286,7 +289,7 @@ jQuery(function($) {
       }
     }
 
-    if (value) {
+    if (value == 'l') {
       let user = document.querySelector("#mainbj #user").value;;
       let pass = document.querySelector("#mainbj #pass").value;
       body ='{"username": "'+ user +'","password": "'+ pass +'"}';
@@ -306,13 +309,13 @@ jQuery(function($) {
       }
     }
     
-    else {
+    else if (value == 's') {
 
       let reg_user = document.querySelector("#mainbj #reg_user").value;
       let reg_pass = document.querySelector("#mainbj #reg_pass").value;
       let conf_pass = document.querySelector("#mainbj #reg_conf_pass").value;
       let reg_email = document.querySelector("#mainbj #reg_email").value;
-      let checkpass = checkPass(reg_pass,conf_pass);
+      let checkpass = checkRegPass(reg_pass,conf_pass);
       reg_body ='{"username": "'+ reg_user +'","password": "'+ checkpass +'","email": "'+ reg_email +'"}';
 
       var url = "/api/auth/signup";
@@ -402,20 +405,22 @@ jQuery(function($) {
     console.log("loginTab");
     tab1bj.setAttribute("aria-selected", "true");
     tab2bj.setAttribute("aria-selected", "false");
-    if (!Cookies.get("x-access-token"))
+    let token = Cookies.get("x-access-token");
+    if (!token || token == "null" || token == "undefined")
     {
       mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked' >"+
       "<input id='user' type='text' placeholder='nom d" + "&#39;" + "utilisateur'/>"+
       "<input id='pass' type='password' placeholder='mot de passe'/></div>"+
-      "<div id='reg_status'></div><div><button class='bjbuttons' onclick='checkLogin(true)'>se connecter</button>"+
-      "<button class='bjbuttons' onclick='logout()'>logout</button></div>'" 
+      "<div id='reg_status'></div><div><button class='bjbuttons' onclick='checkLogin("+'"'+'l'+'"'+")'>se connecter</button>"+
+      "<button class='bjbuttons' onclick='logout()'>logout</button></div>" 
     }
     else
     {
       document.getElementById("tab2bj").remove();
       mainbj.innerHTML = "<div id='logininput' class='typebox field-row-stacked' >"+
-      "<div id='reg_status'>bienvenue "+ parseJwt(Cookies.get("x-access-token")).id +"</div><div><button class='bjbuttons' onclick='checkLogin(true)' disabled>se connecter</button>"+
-      "<button class='bjbuttons' onclick='logout()'>logout</button></div>'" 
+      "<div id='reg_status'>bienvenue "+ parseJwt(Cookies.get("x-access-token")).id +
+      "</div><div><button class='bjbuttons' disabled>se connecter</button>"+
+      "<button class='bjbuttons' onclick='logout()'>logout</button></div>" 
     }
   }
 
@@ -428,7 +433,7 @@ jQuery(function($) {
     "<input id='reg_pass' type='password' placeholder='mot de passe'/>"+
     "<input id='reg_conf_pass' type='password' placeholder='confirmer mot de passe'/>"+
     "<input id='reg_email' type='text' placeholder='email'/></div><div id='reg_status'></div><div id='bjbuttons'>"+
-    "<button onclick='checkLogin()'>s'enregistrer</button></div>"
+    "<button onclick='checkLogin("+'"'+'s'+'"'+")'>s'enregistrer</button></div>"
   }
 
   // other scripts