diff --git a/modules/core/dictionaries/frontpage.definition.json b/modules/core/dictionaries/frontpage.definition.json
index 5fa95513f3905cbdf84d3b25c3fd1f75281ec668..8de47267ef4def6873c8ec89269974122187d3f9 100644
--- a/modules/core/dictionaries/frontpage.definition.json
+++ b/modules/core/dictionaries/frontpage.definition.json
@@ -44,6 +44,9 @@
 	"warnings_https": {
 		"en": "<strong>You are not using HTTPS<\/strong> - encrypted communication with the user. HTTP works fine for test purposes, but in a production environment, you should use HTTPS. [ <a href=\"http:\/\/rnd.feide.no\/content\/simplesamlphp-maintenance-and-configuration\">Read more about simpleSAMLphp maintenance<\/a> ]"
 	},
+	"warnings_secretsalt": {
+		"en": "<strong>The configuration uses the default secret salt</strong> - make sure you modify the default 'secretsalt' option in the simpleSAML configuration in production environments. [<a href=\"http:\/\/simplesamlphp.org\/docs\/trunk\/simplesamlphp-install\">Read more about simpleSAMLphp configuration<\/a> ]"
+	},
 	"warnings_suhosin_url_length": {
 		"en": "The length of query parameters is limited by the PHP Suhosin extension. Please increase the suhosin.get.max_value_length option to at least 2048 bytes."
 	},
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 392ee1815201c3502f7734f50ed4678015071621..6c345d614be765ac80a6fb4fb014f75f4263f779 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -20,6 +20,10 @@ if (!SimpleSAML_Utilities::isHTTPS()) {
 	$warnings[] = '{core:frontpage:warnings_https}';
 }
 
+if ($config->getValue('secretsalt') === 'defaultsecretsalt') {
+	$warnings[] = '{core:frontpage:warnings_secretsalt}';
+}
+
 if (extension_loaded('suhosin')) {
 	$suhosinLength = ini_get('suhosin.get.max_value_length');
 	if (empty($suhosinLength) || (int)$suhosinLength < 2048) {