diff --git a/quesma/quesma/ui/console_routes.go b/quesma/quesma/ui/console_routes.go
index 8b730ea8f..18b30ff23 100644
--- a/quesma/quesma/ui/console_routes.go
+++ b/quesma/quesma/ui/console_routes.go
@@ -23,6 +23,7 @@ const (
 	uiTcpPort              = "9999"
 	managementInternalPath = "/_quesma"
 	healthPath             = managementInternalPath + "/health"
+	loginWithElasticSearch = "/login-with-elasticsearch"
 )
 
 //go:embed asset/*
@@ -70,7 +71,7 @@ func (qmc *QuesmaManagementConsole) createRouting() *mux.Router {
 	router.HandleFunc("/auth/{provider}/callback", authCallbackHandler)
 
 	// our logic for login
-	router.HandleFunc("/login-with-elasticsearch", qmc.HandleElasticsearchLogin)
+	router.HandleFunc(loginWithElasticSearch, qmc.HandleElasticsearchLogin)
 
 	authenticatedRoutes := router.PathPrefix("/").Subrouter()
 	if qmc.cfg.Elasticsearch.User == "" && qmc.cfg.Elasticsearch.Password == "" {
diff --git a/quesma/quesma/ui/es_auth_provider.go b/quesma/quesma/ui/es_auth_provider.go
index 966f6375d..12b2afb59 100644
--- a/quesma/quesma/ui/es_auth_provider.go
+++ b/quesma/quesma/ui/es_auth_provider.go
@@ -25,7 +25,7 @@ func NewElasticsearchAuthProvider() *ElasticsearchAuthProvider {
 type ElasticsearchSession struct{}
 
 func (e ElasticsearchSession) GetAuthURL() (string, error) {
-	return "http://localhost:9999/login-with-elasticsearch", nil
+	return loginWithElasticSearch, nil
 }
 
 func (e ElasticsearchSession) Marshal() string {
diff --git a/quesma/quesma/ui/html_utils.go b/quesma/quesma/ui/html_utils.go
index 56a21f496..28dab3790 100644
--- a/quesma/quesma/ui/html_utils.go
+++ b/quesma/quesma/ui/html_utils.go
@@ -85,8 +85,6 @@ func (qmc *QuesmaManagementConsole) generateTopNavigation(target string) []byte
 	buffer.Html(abTestingPath)
 	buffer.Html(`">A/B</a></li>`)
 
-	buffer.Html(`<li><a href="/logout">Logout</a></li>`)
-
 	if qmc.isAuthEnabled {
 		buffer.Html(`<li><a href="/logout">Logout</a></li>`)
 	}
diff --git a/quesma/quesma/ui/login.go b/quesma/quesma/ui/login.go
index af67fc71c..b173d2b51 100644
--- a/quesma/quesma/ui/login.go
+++ b/quesma/quesma/ui/login.go
@@ -20,7 +20,7 @@ func (qmc *QuesmaManagementConsole) generateLoginForm() []byte {
 	buffer.Html(`<div class="login-form">`)
 	buffer.Html(`<h2>Login</h2>`)
 	buffer.Html(`<p style="color: #ccc;">Log in to Quesma admin console using your Elasticsearch credentials</p>`)
-	buffer.Html(`<form action="/login-with-elasticsearch" method="post">`)
+	buffer.Html(`<form action="`).Text(loginWithElasticSearch).Html(`" method="post">`)
 	buffer.Html(`<label for="username">Username:</label>`)
 	buffer.Html(`<input type="text" id="username" name="username" placeholder="Enter your Elasticsearch username" autofocus>`)
 	buffer.Html(`<label for="password">Password:</label>`)
@@ -41,6 +41,7 @@ func (qmc *QuesmaManagementConsole) HandleElasticsearchLogin(writer http.Respons
 			return
 		}
 		writer.Header().Set("Content-Type", "text/html")
+		writer.Header().Set("HX-Redirect", loginWithElasticSearch)
 		writer.Write(qmc.generateLoginForm())
 	} else if req.Method == http.MethodPost {
 		username := req.FormValue("username")