diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
index b006def12676c02c25adeb22b51aa6870a65fac3..132087463d5a3068d9c23e6e79f19246667c3e72 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
@@ -61,7 +61,7 @@ public class LoginServlet extends HttpServlet {
         if(req.getHeader("authorization") != null){
             res = processUsernamePasswordAuth(req.getHeader("authorization"));
         }
-        //Case 3 SSL Certificate
+        //Case 2 SSL Certificate
         else if(req.getAttribute("jakarta.servlet.request.X509Certificate") != null){
             res = processX509Auth((X509Certificate[])req.getAttribute("jakarta.servlet.request.X509Certificate"));
         }
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java
index d49aa4c41e1e8e7a5c849e061cb9d30e5bd86e62..b6213ab2032c911486edeb7210eafb1a2565570c 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/filters/InstallFilter.java
@@ -58,7 +58,7 @@ public class InstallFilter implements Filter {
             boolean isLogin = false;
             if(request.getServletPath().contains("start")) isLogin = true;
             SignedJWT signedJWT = null;
-            if(request.getHeader("authorization").contains("bearer") || request.getHeader("authorization").contains("Bearer")){
+            if(request.getHeader("authorization") != null && (request.getHeader("authorization").contains("bearer") || request.getHeader("authorization").contains("Bearer"))){
                 try {
                     JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey());
                     signedJWT = SignedJWT.parse(request.getHeader("authorization").replace("bearer","").replace("Bearer",""));
diff --git a/jams-server/src/main/resources/webapp/js/api.js b/jams-server/src/main/resources/webapp/js/api.js
index e74f6df4b27e23ea6942b5542587b8e5ff80eddc..13ff2cd7657ec921b0147e9b61b0f98fe85c4b65 100644
--- a/jams-server/src/main/resources/webapp/js/api.js
+++ b/jams-server/src/main/resources/webapp/js/api.js
@@ -79,7 +79,7 @@ function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction
 
         var jwt = localStorage.getItem('access_token');
         ajax['headers'] =  {
-            "Bearer": jwt,
+            "Authorization": "Bearer " + jwt,
         }
     }
 
@@ -100,14 +100,15 @@ function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction
                 var jwt = localStorage.getItem('access_token');
 
                 ajax['headers'] =  {
-                    "Bearer": jwt,
+                    "Authorization": "Bearer " + jwt,
                 }
-            }
+            } else {
+                ajax['headers'] =  {
+                    "Content-type":"application/json"
 
-            ajax['headers'] =  {
-                "Content-type":"application/json",
-                "Bearer": jwt
+                }
             }
+
             ajax['data'] = JSON.stringify(data);
         }
     }