diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/web/LoginServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/web/LoginServlet.java
index a5c2b1158a3f0394ef37eba9882f94df3188acd9..25975588ccb3880c301229016135a2af17f3c249 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/web/LoginServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/web/LoginServlet.java
@@ -5,8 +5,10 @@ import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import net.jami.jams.common.authentication.AuthenticationSourceType;
 import net.jami.jams.common.dao.StatementElement;
 import net.jami.jams.common.dao.StatementList;
+import net.jami.jams.common.objects.user.AccessLevel;
 import net.jami.jams.common.objects.user.User;
 import net.jami.jams.server.Server;
 import net.jami.jams.server.servlets.filters.WebAppFilter;
@@ -25,6 +27,17 @@ public class LoginServlet extends HttpServlet {
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         //Similar technique as the one for API calls, simply handle this here because this is a different logic.
+        if(!Server.isInstalled.get()){
+            //Basically create the admin user here.
+            User user = new User();
+            user.setUserType(AuthenticationSourceType.LOCAL);
+            user.setAccessLevel(AccessLevel.ADMIN);
+            user.setPassword(req.getParameter("password"));
+            user.setUsername(req.getParameter("username"));
+            Server.dataStore.createUser(user);
+            resp.sendRedirect("/web/install/auth");
+            return;
+        }
         if(Server.userAuthenticationModule.authenticateUser
                 (req.getParameter("username"),req.getParameter("password"))
         ){
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/web/install/CreateAdminAccountServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/web/install/CreateAdminAccountServlet.java
deleted file mode 100644
index c3dbeb6bd71ba9220d7c10caa1a52a226a347721..0000000000000000000000000000000000000000
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/web/install/CreateAdminAccountServlet.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.jami.jams.server.servlets.web.install;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
-
-@WebServlet("/web/install/admin")
-public class CreateAdminAccountServlet extends HttpServlet {
-
-    @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        super.doPost(req, resp);
-    }
-}