diff --git a/pkg/log/log.go b/pkg/log/log.go
index fc79a755d4b..6e75a2b9a8c 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -158,29 +158,6 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
 			loggersToClose = append(loggersToClose, fileHandler)
 			handler = fileHandler
 
-			// case "conn":
-			// 	LogConfigs[i] = util.DynMap{
-			// 		"level":          level,
-			// 		"reconnectOnMsg": sec.Key("reconnect_on_msg").MustBool(),
-			// 		"reconnect":      sec.Key("reconnect").MustBool(),
-			// 		"net":            sec.Key("protocol").In("tcp", []string{"tcp", "unix", "udp"}),
-			// 		"addr":           sec.Key("addr").MustString(":7020"),
-			// 	}
-			// case "smtp":
-			// 	LogConfigs[i] = util.DynMap{
-			// 		"level":     level,
-			// 		"user":      sec.Key("user").MustString("example@example.com"),
-			// 		"passwd":    sec.Key("passwd").MustString("******"),
-			// 		"host":      sec.Key("host").MustString("127.0.0.1:25"),
-			// 		"receivers": sec.Key("receivers").MustString("[]"),
-			// 		"subject":   sec.Key("subject").MustString("Diagnostic message from serve"),
-			// 	}
-			// case "database":
-			// 	LogConfigs[i] = util.DynMap{
-			// 		"level":  level,
-			// 		"driver": sec.Key("driver").String(),
-			// 		"conn":   sec.Key("conn").String(),
-			// 	}
 			// case "syslog":
 			// 	LogConfigs[i] = util.DynMap{
 			// 		"level":    level,
diff --git a/pkg/middleware/logger.go b/pkg/middleware/logger.go
index 5da6decc0f8..c39ae2b62b2 100644
--- a/pkg/middleware/logger.go
+++ b/pkg/middleware/logger.go
@@ -48,7 +48,7 @@ func Logger() macaron.Handler {
 
 		if ctx, ok := c.Data["ctx"]; ok {
 			ctxTyped := ctx.(*Context)
-			ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "uname", ctxTyped.Login, "time_ns", timeTakenMs, "size", rw.Size())
+			ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size())
 		}
 	}
 }
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 69f09ee7f5e..3ca6f156341 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -50,7 +50,7 @@ func GetContextHandler() macaron.Handler {
 			initContextWithAnonymousUser(ctx) {
 		}
 
-		ctx.Logger = log.New("context", "user", ctx.UserId, "orgId", ctx.OrgId)
+		ctx.Logger = log.New("context", "userId", ctx.UserId, "orgId", ctx.OrgId, "uname", ctx.Login)
 		ctx.Data["ctx"] = ctx
 
 		c.Map(ctx)