diff --git a/js/app/ui/module/system_intel.js b/js/app/ui/module/system_intel.js
index 8c2f7631..753e2b19 100644
--- a/js/app/ui/module/system_intel.js
+++ b/js/app/ui/module/system_intel.js
@@ -761,12 +761,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update structures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update structures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, result => {
                     if(result){
                         saveStructureData(structureData, context);
diff --git a/js/app/ui/module/system_signature.js b/js/app/ui/module/system_signature.js
index 3db47abd..1add92e8 100644
--- a/js/app/ui/module/system_signature.js
+++ b/js/app/ui/module/system_signature.js
@@ -742,12 +742,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update signatures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update signatures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, function(result){
                     if(result){
                         saveSignatureData(signatureData);
diff --git a/public/js/v1.5.3/app/ui/module/system_intel.js b/public/js/v1.5.3/app/ui/module/system_intel.js
index 8c2f7631..753e2b19 100644
--- a/public/js/v1.5.3/app/ui/module/system_intel.js
+++ b/public/js/v1.5.3/app/ui/module/system_intel.js
@@ -761,12 +761,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update structures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update structures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, result => {
                     if(result){
                         saveStructureData(structureData, context);
diff --git a/public/js/v1.5.3/app/ui/module/system_signature.js b/public/js/v1.5.3/app/ui/module/system_signature.js
index 3db47abd..1add92e8 100644
--- a/public/js/v1.5.3/app/ui/module/system_signature.js
+++ b/public/js/v1.5.3/app/ui/module/system_signature.js
@@ -742,12 +742,12 @@ define([
             let currentLocationData = Util.getCurrentLocationData();
             if(
                 currentLocationData.id &&
-                currentLocationData.id !== systemData.id
+                currentLocationData.id !== systemData.systemId
             ){
                 let systemNameStr = (systemData.name === systemData.alias) ? '"' + systemData.name + '"' : '"' + systemData.alias + '" (' + systemData.name + ')';
                 systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
 
-                let msg = 'Update signatures in ' + systemNameStr + ' ? This not your current location, "' + currentLocationData.name + '" !';
+                let msg = 'Update signatures in ' + systemNameStr + ' ? This is not your current location, "' + currentLocationData.name + '" !';
                 bootbox.confirm(msg, function(result){
                     if(result){
                         saveSignatureData(signatureData);