diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index e271a1d338..5551c047e3 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -520,11 +520,11 @@ jobs:
         sleep 10
         set +e
         test_output=$(dotnet test -c ${{ matrix.configuration }} --no-build --filter TestCategory=RequiresDatabase --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --collect:"XPlat Code Coverage" --settings ../../build/ci.runsettings --results-directory ../../TestResults)
-        succeeded=$?
+        retval=$?
         set -e
         cd ../..
         echo $test_output > ./test_output.txt
-        if [[ $retVal -ne 0 ]]; then
+        if [[ $retval -ne 0 ]]; then
           echo "succeeded=NO" >> $GITHUB_OUTPUT
         else
           echo "succeeded=YES" >> $GITHUB_OUTPUT
diff --git a/build/Version.props b/build/Version.props
index e5a8b67994..631d7676bd 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- This is the authorative version list -->
   <!-- Integration tests will ensure they match across the board -->
-  <Import Project="ControlPanelVersion.props" />
+  <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
     <TgsCoreVersion>6.0.0</TgsCoreVersion>
     <TgsConfigVersion>5.0.0</TgsConfigVersion>
diff --git a/build/ControlPanelVersion.props b/build/WebpanelVersion.props
similarity index 80%
rename from build/ControlPanelVersion.props
rename to build/WebpanelVersion.props
index 559fd9eeac..3e3a8aa08c 100644
--- a/build/ControlPanelVersion.props
+++ b/build/WebpanelVersion.props
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- This is in it's own file to help incremental building, changing it causes a complete rebuild of the web panel -->
-    <TgsControlPanelVersion>4.27.0</TgsControlPanelVersion>
+    <TgsWebpanelVersion>5.1.0</TgsWebpanelVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
index fb53f5ab33..28b6022e50 100644
--- a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+++ b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
@@ -216,7 +216,7 @@ namespace Tgstation.Server.Host.Controllers
 				|| CheckModified(x => x.Visibility, DreamDaemonRights.SetVisibility)
 				|| (model.SoftRestart.HasValue && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.SoftRestart))
 				|| (model.SoftShutdown.HasValue && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.SoftShutdown))
-				|| (model.BroadcastMessage != null && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.BroadcastMessage))
+				|| (!String.IsNullOrWhiteSpace(model.BroadcastMessage) && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.BroadcastMessage))
 				|| CheckModified(x => x.StartupTimeout, DreamDaemonRights.SetStartupTimeout)
 				|| CheckModified(x => x.HealthCheckSeconds, DreamDaemonRights.SetHealthCheckInterval)
 				|| CheckModified(x => x.DumpOnHealthCheckRestart, DreamDaemonRights.CreateDump)
@@ -231,7 +231,7 @@ namespace Tgstation.Server.Host.Controllers
 				async instance =>
 				{
 					var watchdog = instance.Watchdog;
-					if (model.BroadcastMessage != null
+					if (!String.IsNullOrWhiteSpace(model.BroadcastMessage)
 						&& !await watchdog.Broadcast(model.BroadcastMessage, cancellationToken))
 						return Conflict(new ErrorMessageResponse(ErrorCode.BroadcastFailure));
 
diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs
index df49019d05..06391610c3 100644
--- a/src/Tgstation.Server.Host/Core/Application.cs
+++ b/src/Tgstation.Server.Host/Core/Application.cs
@@ -591,7 +591,7 @@ namespace Tgstation.Server.Host.Core
 			logger.LogTrace("Configuration version: {configVersion}", GeneralConfiguration.CurrentConfigVersion);
 			logger.LogTrace("DMAPI Interop version: {interopVersion}", DMApiConstants.InteropVersion);
 			if (controlPanelConfiguration.Enable)
-				logger.LogTrace("Web control panel version: {webCPVersion}", MasterVersionsAttribute.Instance.RawControlPanelVersion);
+				logger.LogTrace("Webpanel version: {webCPVersion}", MasterVersionsAttribute.Instance.RawWebpanelVersion);
 
 			logger.LogDebug("Starting hosting on port {httpApiPort}...", serverPortProvider.HttpApiPort);
 		}
diff --git a/src/Tgstation.Server.Host/Properties/MasterVersionsAttribute.cs b/src/Tgstation.Server.Host/Properties/MasterVersionsAttribute.cs
index c9bfed3eca..d6461713bb 100644
--- a/src/Tgstation.Server.Host/Properties/MasterVersionsAttribute.cs
+++ b/src/Tgstation.Server.Host/Properties/MasterVersionsAttribute.cs
@@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.Properties
 		/// <summary>
 		/// The <see cref="Version"/> <see cref="string"/> of the control panel version built.
 		/// </summary>
-		public string RawControlPanelVersion { get; }
+		public string RawWebpanelVersion { get; }
 
 		/// <summary>
 		/// The <see cref="Version"/> <see cref="string"/> of the control panel version built.
@@ -46,19 +46,19 @@ namespace Tgstation.Server.Host.Properties
 		/// </summary>
 		/// <param name="rawConfigurationVersion">The value of <see cref="RawConfigurationVersion"/>.</param>
 		/// <param name="rawInteropVersion">The value of <see cref="RawInteropVersion"/>.</param>
-		/// <param name="rawControlPanelVersion">The value of <see cref="RawControlPanelVersion"/>.</param>
+		/// <param name="rawWebpanelVersion">The value of <see cref="RawWebpanelVersion"/>.</param>
 		/// <param name="rawHostWatchdogVersion">The value of <see cref="RawHostWatchdogVersion"/>.</param>
 		/// <param name="rawMariaDBRedistVersion">The value of <see cref="RawMariaDBRedistVersion"/>.</param>
 		public MasterVersionsAttribute(
 			string rawConfigurationVersion,
 			string rawInteropVersion,
-			string rawControlPanelVersion,
+			string rawWebpanelVersion,
 			string rawHostWatchdogVersion,
 			string rawMariaDBRedistVersion)
 		{
 			RawConfigurationVersion = rawConfigurationVersion ?? throw new ArgumentNullException(nameof(rawConfigurationVersion));
 			RawInteropVersion = rawInteropVersion ?? throw new ArgumentNullException(nameof(rawInteropVersion));
-			RawControlPanelVersion = rawControlPanelVersion ?? throw new ArgumentNullException(nameof(rawControlPanelVersion));
+			RawWebpanelVersion = rawWebpanelVersion ?? throw new ArgumentNullException(nameof(rawWebpanelVersion));
 			RawHostWatchdogVersion = rawHostWatchdogVersion ?? throw new ArgumentNullException(nameof(rawHostWatchdogVersion));
 			RawMariaDBRedistVersion = rawMariaDBRedistVersion ?? throw new ArgumentNullException(nameof(rawMariaDBRedistVersion));
 		}
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index 8b8ad755b2..1a972ee3dd 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -22,17 +22,17 @@
     <DefineConstants>$(DefineConstants);NO_WEBPANEL</DefineConstants>
   </PropertyGroup>
 
-  <Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="ClientInstall" BeforeTargets="ResolveAssemblyReferences" Inputs="../../build/ControlPanelVersion.props" Outputs="$(NpmInstallStampFile)">
+  <Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="ClientInstall" BeforeTargets="ResolveAssemblyReferences" Inputs="../../build/WebpanelVersion.props" Outputs="$(NpmInstallStampFile)">
     <Message Text="Pulling web control panel..." Importance="high" />
     <RemoveDir Directories="ClientApp" />
-    <Exec Command="git clone https://github.com/tgstation/tgstation-server-webpanel --branch v$(TgsControlPanelVersion) --depth 1 ClientApp" />
+    <Exec Command="git clone https://github.com/tgstation/tgstation-server-webpanel --branch v$(TgsWebpanelVersion) --depth 1 ClientApp" />
     <RemoveDir Directories="ClientApp/.git" /> <!-- Allows git clean to clean it out -->
     <Message Text="Restoring yarn packages..." Importance="high" />
     <Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) install --immutable" />
     <Touch Files="$(NpmInstallStampFile)" AlwaysCreate="true" />
   </Target>
 
-  <Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="../../build/ControlPanelVersion.props" Outputs="wwwroot\index.html">
+  <Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="../../build/WebpanelVersion.props" Outputs="wwwroot\index.html">
     <Message Text="Building web control panel..." Importance="high" />
     <Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) run msbuild" />
   </Target>
@@ -47,7 +47,7 @@
       <AssemblyAttributes Include="Tgstation.Server.Host.Properties.MasterVersionsAttribute">
         <_Parameter1>$(TgsConfigVersion)</_Parameter1>
         <_Parameter2>$(TgsInteropVersion)</_Parameter2>
-        <_Parameter3>$(TgsControlPanelVersion)</_Parameter3>
+        <_Parameter3>$(TgsWebpanelVersion)</_Parameter3>
         <_Parameter4>$(TgsHostWatchdogVersion)</_Parameter4>
         <_Parameter5>$(TgsMariaDBRedistVersion)</_Parameter5>
       </AssemblyAttributes>
diff --git a/tests/Tgstation.Server.Tests/TestVersions.cs b/tests/Tgstation.Server.Tests/TestVersions.cs
index 1cd8970283..03b998d438 100644
--- a/tests/Tgstation.Server.Tests/TestVersions.cs
+++ b/tests/Tgstation.Server.Tests/TestVersions.cs
@@ -313,11 +313,11 @@ namespace Tgstation.Server.Tests
 		[TestMethod]
 		public void TestControlPanelVersion()
 		{
-			var doc = XDocument.Load("../../../../../build/ControlPanelVersion.props");
+			var doc = XDocument.Load("../../../../../build/WebpanelVersion.props");
 			var project = doc.Root;
 			var controlPanelXmlNamespace = project.GetDefaultNamespace();
 			var controlPanelVersionsPropertyGroup = project.Elements().First(x => x.Name == controlPanelXmlNamespace + "PropertyGroup");
-			var versionString = controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsControlPanelVersion").Value;
+			var versionString = controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsWebpanelVersion").Value;
 			Assert.IsNotNull(versionString);
 			Assert.IsTrue(Version.TryParse(versionString, out var expected));
 
diff --git a/tgstation-server.sln b/tgstation-server.sln
index 36d9027e9d..ce57c2ea30 100644
--- a/tgstation-server.sln
+++ b/tgstation-server.sln
@@ -26,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6
 		build\BuildDox.ps1 = build\BuildDox.ps1
 		build\ci.runsettings = build\ci.runsettings
 		build\Common.props = build\Common.props
-		build\ControlPanelVersion.props = build\ControlPanelVersion.props
 		build\Dockerfile = build\Dockerfile
 		build\GenerateMigrations.sh = build\GenerateMigrations.sh
 		build\logo.svg = build\logo.svg
@@ -39,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6
 		build\tgstation-server.service = build\tgstation-server.service
 		build\uac_elevation_manifest.xml = build\uac_elevation_manifest.xml
 		build\Version.props = build\Version.props
+		build\WebpanelVersion.props = build\WebpanelVersion.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Api", "src\Tgstation.Server.Api\Tgstation.Server.Api.csproj", "{8B4A208D-A48A-4A5D-8B94-E2661138865D}"
diff --git a/tools/Tgstation.Server.ReleaseNotes/Program.cs b/tools/Tgstation.Server.ReleaseNotes/Program.cs
index 21bdbc1bfa..79b594e505 100644
--- a/tools/Tgstation.Server.ReleaseNotes/Program.cs
+++ b/tools/Tgstation.Server.ReleaseNotes/Program.cs
@@ -223,7 +223,7 @@ namespace Tgstation.Server.ReleaseNotes
 
 				string prefix;
 				const string PropsPath = "build/Version.props";
-				const string ControlPanelPropsPath = "build/ControlPanelVersion.props";
+				const string ControlPanelPropsPath = "build/WebpanelVersion.props";
 
 				var doc = XDocument.Load(PropsPath);
 				var project = doc.Root;
@@ -246,7 +246,7 @@ namespace Tgstation.Server.ReleaseNotes
 				var configVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsConfigVersion").Value);
 				var dmApiVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsDmapiVersion").Value);
 				var interopVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsInteropVersion").Value);
-				var webControlVersion = Version.Parse(controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsControlPanelVersion").Value);
+				var webControlVersion = Version.Parse(controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsWebpanelVersion").Value);
 				var hostWatchdogVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsHostWatchdogVersion").Value);
 
 				if (webControlVersion.Major == 0)
@@ -608,14 +608,14 @@ namespace Tgstation.Server.ReleaseNotes
 						dict.Add(Component.NugetApi, Parse("TgsApiLibraryVersion"));
 						dict.Add(Component.NugetClient, Parse("TgsClientVersion"));
 
-						var webVersion = Parse("TgsControlPanelVersion");
+						var webVersion = Parse("TgsWebpanelVersion");
 						if (webVersion != null)
 						{
 							dict.Add(Component.WebControlPanel, webVersion);
 						}
 						else
 						{
-							var controlPanelVersionBytes = await RLR(() => client.Repository.Content.GetRawContentByRef(RepoOwner, RepoName, "build/ControlPanelVersion.props", mergeCommit));
+							var controlPanelVersionBytes = await RLR(() => client.Repository.Content.GetRawContentByRef(RepoOwner, RepoName, "build/WebpanelVersion.props", mergeCommit));
 							using (var ms = new MemoryStream(controlPanelVersionBytes))
 								doc = XDocument.Load(ms);
 
@@ -623,7 +623,7 @@ namespace Tgstation.Server.ReleaseNotes
 							project = doc.Root;
 							var controlPanelXmlNamespace = project.GetDefaultNamespace();
 							var controlPanelVersionsPropertyGroup = project.Elements().First(x => x.Name == controlPanelXmlNamespace + "PropertyGroup");
-							dict.Add(Component.WebControlPanel, Version.Parse(controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsControlPanelVersion").Value));
+							dict.Add(Component.WebControlPanel, Version.Parse(controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsWebpanelVersion").Value));
 						}
 					}