diff --git a/pkg/core/media.go b/pkg/core/media.go
index 8c15b5b5..5d73dc6b 100644
--- a/pkg/core/media.go
+++ b/pkg/core/media.go
@@ -136,6 +136,10 @@ func MarshalSDP(name string, medias []*Media) ([]byte, error) {
 		}
 		md.WithCodec(codec.PayloadType, name, codec.ClockRate, codec.Channels, codec.FmtpLine)
 
+		if media.ID != "" {
+			md.WithValueAttribute("control", media.ID)
+		}
+
 		sd.MediaDescriptions = append(sd.MediaDescriptions, md)
 	}
 
diff --git a/pkg/rtsp/server.go b/pkg/rtsp/server.go
index ce6658b6..74aefe37 100644
--- a/pkg/rtsp/server.go
+++ b/pkg/rtsp/server.go
@@ -40,8 +40,9 @@ func (c *Conn) Accept() error {
 
 		if !c.auth.Validate(req) {
 			res := &tcp.Response{
-				Status: "401 Unauthorized",
-				Header: map[string][]string{"Www-Authenticate": {`Basic realm="go2rtc"`}},
+				Status:  "401 Unauthorized",
+				Header:  map[string][]string{"Www-Authenticate": {`Basic realm="go2rtc"`}},
+				Request: req,
 			}
 			if err = c.WriteResponse(res); err != nil {
 				return err