diff --git a/quesma/quesma/ui/console_routes.go b/quesma/quesma/ui/console_routes.go
index f98e0bbf5..cc05c0cf3 100644
--- a/quesma/quesma/ui/console_routes.go
+++ b/quesma/quesma/ui/console_routes.go
@@ -76,6 +76,7 @@ func (qmc *QuesmaManagementConsole) createRouting() *mux.Router {
 	if qmc.cfg.Elasticsearch.User == "" && qmc.cfg.Elasticsearch.Password == "" {
 		logger.Warn().Msg("admin console authentication is disabled")
 	} else {
+		qmc.isAuthEnabled = true
 		authenticatedRoutes.Use(authMiddleware)
 	}
 
diff --git a/quesma/quesma/ui/dashboard.go b/quesma/quesma/ui/dashboard.go
index 3f956e3f2..0068f5b50 100644
--- a/quesma/quesma/ui/dashboard.go
+++ b/quesma/quesma/ui/dashboard.go
@@ -21,7 +21,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateDashboard() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("dashboard"))
+	buffer.Write(qmc.generateTopNavigation("dashboard"))
 
 	buffer.Html(`<main id="dashboard-main">` + "\n")
 
diff --git a/quesma/quesma/ui/data_sources.go b/quesma/quesma/ui/data_sources.go
index b279cd962..57efaf33a 100644
--- a/quesma/quesma/ui/data_sources.go
+++ b/quesma/quesma/ui/data_sources.go
@@ -10,7 +10,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateDatasourcesPage() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("data-sources"))
+	buffer.Write(qmc.generateTopNavigation("data-sources"))
 
 	buffer.Html(`<main id="data-sources">`)
 	buffer.Write(qmc.generateDatasources())
diff --git a/quesma/quesma/ui/html_utils.go b/quesma/quesma/ui/html_utils.go
index 6fa4b5c5d..3419d43ef 100644
--- a/quesma/quesma/ui/html_utils.go
+++ b/quesma/quesma/ui/html_utils.go
@@ -18,7 +18,7 @@ func generateSimpleTop(title string) []byte {
 	return buffer.Bytes()
 }
 
-func generateTopNavigation(target string) []byte {
+func (qmc *QuesmaManagementConsole) generateTopNavigation(target string) []byte {
 	var buffer builder.HtmlBuffer
 	buffer.Html(`<div class="topnav">` + "\n")
 	buffer.Html(`<div class="topnav-menu">` + "\n")
@@ -76,7 +76,11 @@ func generateTopNavigation(target string) []byte {
 		buffer.Html(` class="active"`)
 	}
 	buffer.Html(`><a href="/data-sources">Data sources</a></li>`)
-	buffer.Html(`<li><a href="/logout">Logout</a></li>`)
+
+	if qmc.isAuthEnabled {
+		buffer.Html(`<li><a href="/logout">Logout</a></li>`)
+	}
+
 	buffer.Html("\n</ul>\n")
 	buffer.Html("\n</div>\n")
 
diff --git a/quesma/quesma/ui/ingest.go b/quesma/quesma/ui/ingest.go
index 1bca2dfc2..52a92e7af 100644
--- a/quesma/quesma/ui/ingest.go
+++ b/quesma/quesma/ui/ingest.go
@@ -11,7 +11,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateIngestStatistics() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("statistics"))
+	buffer.Write(qmc.generateTopNavigation("statistics"))
 
 	buffer.Html(`<main id="statistics">`)
 	buffer.Write(qmc.generateStatistics())
diff --git a/quesma/quesma/ui/live_tail.go b/quesma/quesma/ui/live_tail.go
index 7a806994e..3f87f1c93 100644
--- a/quesma/quesma/ui/live_tail.go
+++ b/quesma/quesma/ui/live_tail.go
@@ -15,7 +15,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateLiveTail() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("queries"))
+	buffer.Write(qmc.generateTopNavigation("queries"))
 
 	// This preserves scrolling, but does not work if new queries appear.
 	buffer.Html(`<script>
diff --git a/quesma/quesma/ui/management_console.go b/quesma/quesma/ui/management_console.go
index ac89e1bf8..4b4404110 100644
--- a/quesma/quesma/ui/management_console.go
+++ b/quesma/quesma/ui/management_console.go
@@ -102,6 +102,8 @@ type (
 		schemasProvider           SchemasProvider
 		totalUnsupportedQueries   int
 		tableResolver             table_resolver.TableResolver
+
+		isAuthEnabled bool
 	}
 	SchemasProvider interface {
 		AllSchemas() map[schema.TableName]schema.Schema
diff --git a/quesma/quesma/ui/routing.go b/quesma/quesma/ui/routing.go
index 69c3f73fd..8b5bc2a4a 100644
--- a/quesma/quesma/ui/routing.go
+++ b/quesma/quesma/ui/routing.go
@@ -10,7 +10,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateRouterStatisticsLiveTail() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("routing-statistics"))
+	buffer.Write(qmc.generateTopNavigation("routing-statistics"))
 
 	buffer.Html(`<main id="routing-statistics">`)
 	buffer.Write(qmc.generateRouterStatistics())
diff --git a/quesma/quesma/ui/schemas.go b/quesma/quesma/ui/schemas.go
index 8329c4d0f..57513e53a 100644
--- a/quesma/quesma/ui/schemas.go
+++ b/quesma/quesma/ui/schemas.go
@@ -9,7 +9,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateSchemas() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("schemas"))
+	buffer.Write(qmc.generateTopNavigation("schemas"))
 	buffer.Html(`<main id="schemas">`)
 
 	schemas := qmc.schemasProvider.AllSchemas()
diff --git a/quesma/quesma/ui/table_resolver.go b/quesma/quesma/ui/table_resolver.go
index b771fc1e6..5d0903c56 100644
--- a/quesma/quesma/ui/table_resolver.go
+++ b/quesma/quesma/ui/table_resolver.go
@@ -10,7 +10,7 @@ import (
 func (qmc *QuesmaManagementConsole) generateTableResolver() []byte {
 
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("table_resolver"))
+	buffer.Write(qmc.generateTopNavigation("table_resolver"))
 
 	buffer.Html(`<main id="table_resolver">`)
 
diff --git a/quesma/quesma/ui/tables.go b/quesma/quesma/ui/tables.go
index facafbe99..0de93883a 100644
--- a/quesma/quesma/ui/tables.go
+++ b/quesma/quesma/ui/tables.go
@@ -15,7 +15,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateQuesmaAllLogs() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("tables"))
+	buffer.Write(qmc.generateTopNavigation("tables"))
 	buffer.Html(`<main id="quesma_all_logs">`)
 
 	var schema clickhouse.TableMap
@@ -182,7 +182,7 @@ func (qmc *QuesmaManagementConsole) generateTables() []byte {
 	}
 
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("tables"))
+	buffer.Write(qmc.generateTopNavigation("tables"))
 	buffer.Html(`<main id="tables">`)
 
 	var schema clickhouse.TableMap
diff --git a/quesma/quesma/ui/telemetry.go b/quesma/quesma/ui/telemetry.go
index b46f55c47..f88a8f118 100644
--- a/quesma/quesma/ui/telemetry.go
+++ b/quesma/quesma/ui/telemetry.go
@@ -9,7 +9,7 @@ import (
 
 func (qmc *QuesmaManagementConsole) generateTelemetry() []byte {
 	buffer := newBufferWithHead()
-	buffer.Write(generateTopNavigation("telemetry"))
+	buffer.Write(qmc.generateTopNavigation("telemetry"))
 	buffer.Html(`<main id="telemetry">`)
 
 	buffer.Html(`<h2>Telemetry</h2>`)