diff --git a/ui3.htm b/ui3.htm
index 83bbf70..8e7b856 100644
--- a/ui3.htm
+++ b/ui3.htm
@@ -42,7 +42,7 @@
 		};
 	</script>
 	<script type="text/javascript">
-		var ui_version = "78";
+		var ui_version = "79";
 		var bi_version = "%%VERSION%%";
 		var combined_version = ui_version + "-" + bi_version;
 		//if (!!navigator.userAgent.match(/ Android /))
diff --git a/ui3/help/img/GroupProperties.png b/ui3/help/img/GroupProperties.png
index 19ad730..902159c 100644
Binary files a/ui3/help/img/GroupProperties.png and b/ui3/help/img/GroupProperties.png differ
diff --git a/ui3/ui3.js b/ui3/ui3.js
index dbe0ff6..ae31d0c 100644
--- a/ui3/ui3.js
+++ b/ui3/ui3.js
@@ -8723,9 +8723,9 @@ function CameraListLoader()
 
 				if (!firstCameraListLoaded && numCameras > 1 && settings.ui3_webcasting_disabled_dontShowAgain != "1")
 				{
-					webcastingWarning = toaster.Info('Webcasting may not be enabled for some of your camera groups.<br><br>'
-						+ camsNotInGroup.length + ' camera' + (camsNotInGroup.length == 1 ? ' has' : 's have')
-						+ ' been individually added to the Current Group dropdown list.<br><br>'
+					webcastingWarning = toaster.Info(camsNotInGroup.length + ' camera' + (camsNotInGroup.length == 1 ? ' has' : 's have')
+						+ ' been individually added to the Current Group dropdown list because ' + (camsNotInGroup.length == 1 ? 'it was' : 'they were')
+						+ ' not found in any group that has webcasting enabled.<br><br>'
 						+ '<input type="button" class="simpleTextButton btnGreen" value="Learn more" onclick="UIHelp.LearnMore(\'Camera Group Webcasting\')" /><br><br>'
 						+ '<input type="button" class="simpleTextButton btnRed" value="Do not warn again" onclick="DontShowWebcastingWarningAgain()" />'
 						, 60000, true);
@@ -9092,6 +9092,23 @@ function VideoPlayerController()
 			, imageRenderer.CamImgDragMove
 			, imageRenderer.CamImgDragEnd
 		);
+
+		BI_CustomEvent.AddListener("CameraListLoaded", UpdatedCurrentCameraData);
+	}
+	var UpdatedCurrentCameraData = function ()
+	{
+		currentlyLoadingCamera = GetUpdatedCameraData(currentlyLoadingCamera);
+		currentlyLoadedCamera = GetUpdatedCameraData(currentlyLoadedCamera);
+	}
+	var GetUpdatedCameraData = function (currentCameraData)
+	{
+		if (currentCameraData)
+		{
+			var updatedCameraData = cameraListLoader.GetCameraWithId(currentCameraData.optionValue);
+			if (updatedCameraData)
+				return updatedCameraData;
+		}
+		return currentCameraData;
 	}
 	var IsDoubleClickFullscreenEnabled = function ()
 	{
@@ -20735,8 +20752,9 @@ function UIHelpTool()
 		var $root = $('<div class="UIHelp">'
 			+ 'This interface is easier to use when all your camera groups have webcasting enabled.<br><br>'
 			+ 'Enable webcasting for your groups using the group settings panel.  This panel is found in the lower-left corner of the Blue Iris console (only when PTZ controls are enabled):<br><br>'
+			+ 'Some other configurations may also lead to this message being shown.<br><br>'
 			+ '</div>');
-		var $img = $('<img src="ui3/help/img/GroupProperties.png' + currentServer.GetLocalSessionArg("?") + '" style="width:400px; height:320px;" />');
+		var $img = $('<img src="ui3/help/img/GroupProperties.png' + currentServer.GetLocalSessionArg("?") + '" style="width:380px; height:255px;" />');
 		$root.append($img);
 		$img.lightbox();
 		$root.modalDialog({ title: 'Camera Group Webcasting', closeOnOverlayClick: true });