diff --git a/pkg/generate/config.go b/pkg/generate/config.go
index c2bffcb..db7ddb1 100644
--- a/pkg/generate/config.go
+++ b/pkg/generate/config.go
@@ -111,12 +111,8 @@ func buildInfo(req *Request) *cameraInfo {
 			info.addCredential(subSection, subKey, subValue)
 		}
 
-		subPath := "rtsp://127.0.0.1:8554/" + subName
-		if needMP4[subScheme] {
-			subPath += "?mp4"
-		}
-		subInputArgs := "preset-rtsp-restream"
-
+		// apply go2rtc overrides BEFORE deriving subPath -- otherwise a rename
+		// would desync go2rtc.streams (new name) and frigate inputs (old name).
 		if req.Go2RTC != nil {
 			if req.Go2RTC.SubStreamName != "" {
 				subName = req.Go2RTC.SubStreamName
@@ -129,6 +125,13 @@ func buildInfo(req *Request) *cameraInfo {
 				}
 			}
 		}
+
+		subPath := "rtsp://127.0.0.1:8554/" + subName
+		if needMP4[subScheme] {
+			subPath += "?mp4"
+		}
+		subInputArgs := "preset-rtsp-restream"
+
 		if req.Frigate != nil {
 			if req.Frigate.SubStreamPath != "" {
 				subPath = req.Frigate.SubStreamPath
diff --git a/www/config.html b/www/config.html
index e5a71af..f6b10c9 100644
--- a/www/config.html
+++ b/www/config.html
@@ -479,8 +479,7 @@
     var defaultName = ip ? 'camera_' + ip.replace(/\./g, '_') : 'camera';
     document.getElementById('f-name').value = defaultName;
 
-    // prefill ONVIF from probe
-    if (ip) document.getElementById('f-onvif-host').value = ip;
+    // prefill ONVIF user only (host stays empty so the onvif block is opt-in)
     if (userParam) document.getElementById('f-onvif-user').value = userParam;
 
     // -- tabs (mobile) --