diff --git a/jams-server/src/main/java/net/jami/jams/server/Server.java b/jams-server/src/main/java/net/jami/jams/server/Server.java
index 35d17436a759fa226e8d94af5ae06673f0291586..b4c0ada26e4621e1c8ece56da3a0eff760ae6b65 100644
--- a/jams-server/src/main/java/net/jami/jams/server/Server.java
+++ b/jams-server/src/main/java/net/jami/jams/server/Server.java
@@ -78,15 +78,6 @@ public class Server {
     public static void main(String[] args) {
         //This is a fix to drop old cached stuff from the tomcat classloader.
         ClassPool.getDefault().clearImportedPackages();
-        //TODO: Remove this entirely, as we no longer need to do dynamic codegen.
-        //ScopedServletAnnotationScanner scanner = new ScopedServletAnnotationScanner();
-        //Here we need to scan and modify our servlets, this is not necessarily the greatest thing ever.
-        //try {
-        //    scanner.scanAndModify(PackageScanner.getClasses());
-        //}
-        //catch (Exception e){
-        //    log.error("Could not modify the annotated files");
-        //}
         switch (args.length) {
             case 1:
                 tomcatLauncher = new TomcatLauncher(Integer.parseInt(args[0]));
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
index 15db13cfdbf4c9a66830ff15428d87fe861190a3..a4acf3b034565fab4132685325ae56741e9115e2 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
@@ -95,7 +95,7 @@ public class TomcatLauncher {
         }
         context.setResources(resources);
         //We always go to login by default.
-        context.addWelcomeFile("templates/signup.html");
+        context.addWelcomeFile("index");
         ErrorPage errorPage = new ErrorPage();
         errorPage.setErrorCode(404);
         context.addErrorPage(errorPage);
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/general/IndexServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/general/IndexServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..13a0fba76a03f8b193df2afec52fefcdbb5e927e
--- /dev/null
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/general/IndexServlet.java
@@ -0,0 +1,19 @@
+package net.jami.jams.server.servlets.general;
+
+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("/index")
+public class IndexServlet extends HttpServlet {
+
+    //This is to by-pass the path issue.
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.sendRedirect("/templates/signup.html");
+    }
+}