diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py
index 5519396eb3fa50fa0ba6f00176ddab7b9d294a6f..e87634e2e1f4944d2f77f1e99da15004921dd4dc 100755
--- a/VIPSWeb/local_settings_sample.py
+++ b/VIPSWeb/local_settings_sample.py
@@ -116,6 +116,8 @@ VIPSLOGIC_SERVER_NAME = "vipslogic"
 VIPSLOGIC_PROTOCOL = "https"
 # This organization's ID in VIPSLogic/CoreManager
 VIPS_ORGANIZATION_ID = 1
+# Use this if you want to override and show icons for stations belonging to several organizations
+#FORECAST_MAP_ORGANIZATION_IDS =[1,6]
 # The server name used for VIPSCoreManager
 VIPSCOREMANAGER_SERVER_NAME = "vipscoremanager"
 # Local path to self signed certificate of VIPSCoreManager. 
diff --git a/VIPSWeb/static/js/frontpageMap.js b/VIPSWeb/static/js/frontpageMap.js
index 87c021cf3f2909b3ec89e5fcc2bba0d383a5b91f..668d29c0bd7247d9323b079b2a98ec3a1b0ce0b6 100755
--- a/VIPSWeb/static/js/frontpageMap.js
+++ b/VIPSWeb/static/js/frontpageMap.js
@@ -408,7 +408,13 @@ function updateForecastLayers()
 	forecastLayer = new ol.layer.Vector({
 		source: new ol.source.Vector({
 			//url: settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/forecastresults/aggregate/" + settings.vipsOrganizationId + "?" + cropCategoryIdStr,
-			url: "/vipslogicproxy/rest/forecastresults/aggregate/" + settings.vipsOrganizationId + "?" + cropCategoryIdStr,
+			url: "/vipslogicproxy/rest/forecastresults/aggregate/" + 
+				(
+						settings.forecastMapOrganizationIds != null && settings.forecastMapOrganizationIds.length > 0 ? 
+						"orgspan?organizationId=" + settings.forecastMapOrganizationIds.join("&organizationId=") + cropCategoryIdStr
+						: settings.vipsOrganizationId + "?" + cropCategoryIdStr
+				) 
+				,
 			format: new ol.format.KML(),
 			projection: ol.proj.get('EPSG:3857')
 		})
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index 4edbaf51008d8e064102699bf0606aea44be416a..7523c55e6ff6da6770601f4b95c316e363d381eb 100755
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -44,7 +44,7 @@
 
 		if(settings.userIsIE)
 		{
-			alert("{% trans "WARNING: We suspect you are using Internet Explorer to view this site. VIPS is not designed to work with Internet Explorer, you may experience errors and missing features. Please use a different browser, like Microsoft Edge or Google Chrome." %}");
+			alert("{% trans "WARNING: We suspect you are using Internet Explorer to view this site. VIPS is not designed to work with Internet Explorer, you may experience errors and missing features. Please use a different browser, like Firefox, Microsoft Edge or Google Chrome." %}");
 		}
 
 		
diff --git a/VIPSWeb/templates/settings.js b/VIPSWeb/templates/settings.js
index 918e8f69193c4d484c3bdd7353e6aa83babfb866..3a3ed9f9580b9a3b3bc368f015212a383d0e28e5 100755
--- a/VIPSWeb/templates/settings.js
+++ b/VIPSWeb/templates/settings.js
@@ -25,6 +25,8 @@ var settings = {
 		vipslogicProtocol: "{{settings.VIPSLOGIC_PROTOCOL}}",
 		vipsCoremanagerServerName : "{{settings.VIPSCOREMANAGER_SERVER_NAME}}",
 		
+		forecastMapOrganizationIds: {{settings.FORECAST_MAP_ORGANIZATION_IDS}},
+		
 		mapZoomlevel: {{settings.MAP_ZOOMLEVEL}},
 		
 		systemTimeOffsetMonths: {{settings.SYSTEM_TIME_OFFSET_MONTHS}},