diff --git a/server/internal/app/app.go b/server/internal/app/app.go
index cb0c484ed..94790e08e 100644
--- a/server/internal/app/app.go
+++ b/server/internal/app/app.go
@@ -58,22 +58,24 @@ func initEcho(ctx context.Context, cfg *ServerConfig) *echo.Echo {
 	}
 
 	// auth
-	authConfig := cfg.Config.JWTProviders()
-	log.Infof("auth: config: %#v", authConfig)
-
 	var wrapHandler func(http.Handler) http.Handler
 	if cfg.Config.UseMockAuth() {
 		log.Infof("Using mock auth for local development")
 		wrapHandler = func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
 				ctx := r.Context()
 				ctx = adapter.AttachMockAuth(ctx, true)
 				next.ServeHTTP(w, r.WithContext(ctx))
 			})
 		}
 	} else {
-		wrapHandler = lo.Must(appx.AuthMiddleware(authConfig, adapter.ContextAuthInfo, true))
+		authConfig := cfg.Config.JWTProviders()
+		log.Infof("auth: config: %#v", authConfig)
+		if cfg.Config.AuthSrv.Disabled {
+			wrapHandler = lo.Must(AuthMiddlewareDummy())
+		} else {
+			wrapHandler = lo.Must(appx.AuthMiddleware(authConfig, adapter.ContextAuthInfo, true))
+		}
 	}
 
 	e.Use(echo.WrapMiddleware(wrapHandler))
@@ -159,6 +161,12 @@ func initEcho(ctx context.Context, cfg *ServerConfig) *echo.Echo {
 	return e
 }
 
+func AuthMiddlewareDummy() (func(http.Handler) http.Handler, error) {
+	return func(next http.Handler) http.Handler {
+		return next
+	}, nil
+}
+
 func errorHandler(next func(error, echo.Context)) func(error, echo.Context) {
 	return func(err error, c echo.Context) {
 		if c.Response().Committed {
diff --git a/server/internal/app/auth_client.go b/server/internal/app/auth_client.go
index 3f46a126f..ccdf20898 100644
--- a/server/internal/app/auth_client.go
+++ b/server/internal/app/auth_client.go
@@ -102,7 +102,9 @@ func attachOpMiddleware(cfg *ServerConfig) echo.MiddlewareFunc {
 
 			if u != nil {
 				ctx = adapter.AttachUser(ctx, u)
-				log.Debugfc(ctx, "auth: user: id=%s name=%s email=%s", u.ID(), u.Name(), u.Email())
+				if u.Name() != "e2e" {
+					log.Debugfc(ctx, "auth: user: id=%s name=%s email=%s", u.ID(), u.Name(), u.Email())
+				}
 
 				op, err := generateOperator(ctx, cfg, u)
 				if err != nil {
@@ -110,7 +112,9 @@ func attachOpMiddleware(cfg *ServerConfig) echo.MiddlewareFunc {
 				}
 
 				ctx = adapter.AttachOperator(ctx, op)
-				log.Debugfc(ctx, "auth: op: %#v", op)
+				if u.Name() != "e2e" {
+					log.Debugfc(ctx, "auth: op: %#v", op)
+				}
 			}
 
 			ctx = adapter.AttachCurrentHost(ctx, cfg.Config.Host)