diff --git a/Changelog b/Changelog
index 728c73ce8..1690a3dbe 100644
--- a/Changelog
+++ b/Changelog
@@ -7,10 +7,11 @@ Nagios Core 4 Change Log
 FIXES
 * Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson)
 * Fixed a make error when building on the aarch64 architecture (#598) (Gareth Randall)
-* Fixed soft recovery states for services (#575) (Jacob Omann)
-* Fixed XSS vulnerability in Alert Summary report (CVE-2018-18245) (Jacob Omann)
-* Fixed services in soft states sometimes not switching into hard states (#576) (Jacob Omann)
-* Fixed last_state_change to update when a state goes from soft -> hard state (#592) (Jacob Omann)
+* Fixed soft recovery states for services (#575) (Jake Omann)
+* Fixed XSS vulnerability in Alert Summary report (CVE-2018-18245) (Jake Omann)
+* Fixed services in soft states sometimes not switching into hard states (#576) (Jake Omann)
+* Fixed last_state_change to update when a state goes from soft -> hard state (#592) (Jake Omann)
+* Fixed Map link always being set to undefined host (#539) (Jake Omann)
 
 4.4.2 - 2018-08-16
 ------------------
diff --git a/html/js/nagios-decorations.js b/html/js/nagios-decorations.js
index 284c45874..0fa2dbcb8 100644
--- a/html/js/nagios-decorations.js
+++ b/html/js/nagios-decorations.js
@@ -23,7 +23,8 @@ angular.module("nagiosDecorations", [])
 				lastUpdate: "=lastUpdate",
 				initialState: "@initialState",
 				collapsible: "@collapsible",
-				includePartial: "@includePartial"
+				includePartial: "@includePartial",
+				root: "@root"
 			},
 			controller: function($scope, $element, $attrs, $http) {
 
@@ -34,6 +35,12 @@ angular.module("nagiosDecorations", [])
 
 				$scope.haveProgramStatus = false;
 
+				// Create cgiurl and root node name
+				$scope.params = { cgiurl: $scope.cgiurl, root: $scope.root };
+				$scope.$watch("root", function() {
+					$scope.params.root = $scope.root;
+				});
+
 				$scope.$watch("cgiurl", function() {
 					getStatus();
 				});
diff --git a/html/map-links.html b/html/map-links.html
index fe9759e05..80a5244de 100644
--- a/html/map-links.html
+++ b/html/map-links.html
@@ -3,16 +3,16 @@
 		<tr>
 			<td class="linkBox">
 				<span ng-show="params.root != 'Nagios Process'">
-					<a ng-href="{{params.cgiurl}}cgi-bin/status.cgi?host={{params.host | uriComponentEncode}}" target="_self">
+					<a ng-href="{{params.cgiurl}}status.cgi?host={{params.root | uriComponentEncode}}" target="_self">
 						View Status Detail For This Host
 					</a>
 					<br/>
 				</span>
-				<a ng-href="{{params.cgiurl}}cgi-bin/status.cgi?host=all" target="_self">
+				<a ng-href="{{params.cgiurl}}status.cgi?host=all" target="_self">
 					View Status Detail For All Hosts
 				</a>
 				<br/>
-				<a ng-href="{{params.cgiurl}}cgi-bin/status.cgi?hostgroup=all" target="_self">
+				<a ng-href="{{params.cgiurl}}status.cgi?hostgroup=all" target="_self">
 					View Status Overview For All Hosts
 				</a>
 			</td>
diff --git a/html/map.php b/html/map.php
index db4e23cf8..1692728f9 100644
--- a/html/map.php
+++ b/html/map.php
@@ -97,7 +97,8 @@
 					last-update="lastUpdate"
 					initial-state="collapsed"
 					collapsible="true"
-					include-partial="map-links.html">
+					include-partial="map-links.html"
+					root="{{params.root}}">
 			</div>
 		</div>
 		<div id="map-container" ng-hide="formDisplayed"