diff --git a/gms-ui/.env.production b/gms-ui/.env.production
index 384270e51d87fb2718f8550b2360037269c9ee7f..64c8364dd0191c84b8fe5dffb41abd01962bd626 100644
--- a/gms-ui/.env.production
+++ b/gms-ui/.env.production
@@ -1,2 +1,2 @@
 VUE_APP_API_CLIENT = 'server'
-VUE_APP_API_BASE_URL = 'http://localhost:8081/'
+VUE_APP_API_BASE_URL = '/'
diff --git a/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java b/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
deleted file mode 100644
index 190aaf038f5bb56c593a14442d9c9455e4518c94..0000000000000000000000000000000000000000
--- a/gms/src/main/java/it/inaf/ia2/gms/authn/LoginController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package it.inaf.ia2.gms.authn;
-
-import java.security.Principal;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class LoginController {
-
-    @Autowired
-    private SessionData sessionData;
-
-    @GetMapping("/login")
-    public Principal start(Principal principal) {
-        return principal;
-    }
-
-    @GetMapping(value = "/", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Principal root(Principal principal) {
-        return principal;
-    }
-}
diff --git a/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java b/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java
index 294ed8c1e77ee160d5123360456d36dea5950e61..d452076ab09d4788f2ed903145be1166bdf17d17 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/controller/HomePageController.java
@@ -36,4 +36,9 @@ public class HomePageController {
 
         return ResponseEntity.ok(response);
     }
+
+    @GetMapping(value = "/", produces = MediaType.TEXT_HTML_VALUE)
+    public String index() {
+        return "index.html";
+    }
 }