diff --git a/server/auth.go b/server/auth.go
index 96907d9c9..4b80c7b2c 100644
--- a/server/auth.go
+++ b/server/auth.go
@@ -295,6 +295,7 @@ func UsernameFromReverseProxyHeader(r *http.Request) string {
 func contextWithUser(ctx context.Context, ds model.DataStore, username string) (context.Context, error) {
 	user, err := ds.User(ctx).FindByUsername(username)
 	if err == nil {
+		ctx = request.WithUsername(ctx, user.UserName)
 		return request.WithUser(ctx, *user), nil
 	}
 	log.Error(ctx, "Authenticated username not found in DB", "username", username)