diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index dcd113d2..2099b38e 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -270,7 +270,7 @@ DOCUMENTATION :: END
                                 <div class="sub-heading">Location</div>
                                 <div class="sub-value time-right">
                                     % if data['ip_address'] != 'N/A':
-                                    ${data['location'].upper()}: <span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span>
+                                    <span id="location-${sk}">${data['location'].upper()}</span>: <span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span>
                                     <a href="#" class="external_ip-modal" data-toggle="modal" data-target="#ip-info-modal" data-ip="${data['ip_address']}">
                                         <span id="external_ip-${sk}" class="external-ip-tooltip" data-toggle="tooltip" title="Lookup External IP" style="display: none;"><i class="fa fa-map-marker"></i></span>
                                     </a>
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 39d427f6..65d03e50 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -485,6 +485,8 @@
                         $('#optimized_version-' + key).html(s.optimized_version_profile + ' (' + s.optimized_version_title + ')');
                         $('#synced_quality_profile-' + key).html(s.synced_quality_profile);
 
+                        $('#location-' + key).html(s.location.toUpperCase());
+                        
                         if (s.media_type !== 'photo' && parseInt(s.bandwidth)) {
                             var bw = parseInt(s.bandwidth);
                             if (bw !== "Unknown") {