diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 7639bcb50..831ad0ffb 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -735,8 +735,12 @@ if ($e107_popup != 1) {
 		echo "<div id='uiAlert' class='notifications center'></div>"; // Popup Alert Message holder. @see http://nijikokun.github.io/bootstrap-notify/
 	}
 
-	// Display Welcome Message when old method activated.
-	if(strstr($HEADER,"{WMESSAGE")===false && strstr($FOOTER,"{WMESSAGE")===false) // Auto-detection to override old pref. 
+    /**
+     * Display Welcome Message when old method activated.
+     * fix - only when e_FRONTPAGE set to true
+     * @see \core_index_index_controller\actionIndex
+     */
+    if(deftrue('e_FRONTPAGE') && strstr($HEADER,"{WMESSAGE")===false && strstr($FOOTER,"{WMESSAGE")===false) // Auto-detection to override old pref.
 	{
 		echo e107::getParser()->parseTemplate("{WMESSAGE}");
 	}