diff --git a/src/http_ana.c b/src/http_ana.c
index c18d0764d..faa2d239d 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -653,7 +653,7 @@ int http_process_request(struct stream *s, struct channel *req, int an_bit)
 
 		/* send unique ID if a "unique-id-header" is defined */
 		if (isttest(sess->fe->header_unique_id) &&
-		    unlikely(!http_add_header(htx, sess->fe->header_unique_id, s->unique_id)))
+		    unlikely(!http_add_header(htx, sess->fe->header_unique_id, unique_id)))
 				goto return_int_err;
 	}
 
diff --git a/src/stream.c b/src/stream.c
index 29d1a60b5..d18031e41 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -2850,7 +2850,7 @@ INITCALL0(STG_INIT, init_stream);
 
 /* Generates a unique ID based on the given <format>, stores it in the given <strm> and
  * returns the unique ID.
-
+ *
  * If this function fails to allocate memory IST_NULL is returned.
  *
  * If an ID is already stored within the stream nothing happens existing unique ID is