diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index d775eb4b9..0fd7312f2 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -236,15 +236,21 @@ if ($action == "opt") {
 		<tr>
 			<td>".WMLAN_05."</td>
 			<td>".$frm->checkbox('wm_enclose', 1, varset($pref['wm_enclose'],0))."<span class='field-help'>".WMLAN_06."</span></td>
-		</tr>
+		</tr>";
+	
+	/*	DEPRECATED - see header_default.php {WMESSAGE}
+	$text .= "
 		<tr>
 			<td>".WMLAN_07."</td>
 			<td>".$frm->checkbox('wmessage_sc', 1, varset($pref['wmessage_sc'],0))."</td>
-		</tr>
+		</tr>";
+	*/	
+	
+	$text .= "
 		</table>
 
 		<div class='buttons-bar center'>
-			".$text .= $frm->admin_button('updateoptions', LAN_SAVE)."
+			". $frm->admin_button('updateoptions', LAN_SAVE)."
 		</div>
 		</fieldset>
 		</form>
diff --git a/e107_core/shortcodes/single/wmessage.php b/e107_core/shortcodes/single/wmessage.php
index 77a196693..19c6fba3e 100644
--- a/e107_core/shortcodes/single/wmessage.php
+++ b/e107_core/shortcodes/single/wmessage.php
@@ -8,12 +8,13 @@ function wmessage_shortcode($parm)
 	$e107cache = e107::getCache();
 	$pref = e107::getPref();
 	
+	/* DEPRECATED - see auto-detect in header_default.php 
 	$prefwmsc = varset($pref['wmessage_sc'], FALSE);
 	if (($prefwmsc && $parm == 'header') || (!$prefwmsc && ($parm !='header')) )
 	{	// Two places it might be invoked - allow one or the other
-		return;
+	//	return;
 	}
-
+	*/
 	
 	if ($parm != 'force')
 		{
diff --git a/e107_core/templates/footer_default.php b/e107_core/templates/footer_default.php
index 403c0e3c0..b055f4093 100644
--- a/e107_core/templates/footer_default.php
+++ b/e107_core/templates/footer_default.php
@@ -318,11 +318,10 @@ echo "\n<!-- ".md5($bcache)." -->\n";
 
 unset($uclist, $bcache);
 
-if(!deftrue('e_POWEREDBY_DISABLE')) 
-{
-	// No IDs or Classes - hinder js disable. 	
-	echo "<div style='text-align:center; display:block; position: absolute; width:100%;height:20px; margin-top:-30px; z-index:30000; opacity:1.0; color: silver'>Proudly powered by <a style='color:silver' href='http://e107.org/' title='e107 Content Management System'>e107</a></div>";
-}
+$show = deftrue('e_POWEREDBY_DISABLE') ? "none" : "block"; // Let search engines find us to increase e107.org ranking - even if hidden. 
+//XXX Must not contain IDs or Classes 	
+echo "<div style='text-align:center; display:".$show."; position: absolute; width:99%; height:20px; margin-top:-30px; z-index:30000; opacity:1.0; color: silver'>Proudly powered by <a style='color:silver' href='http://e107.org/' title='e107 Content Management System'>e107</a></div>";
+unset($show);
 echo "\n</body>\n</html>";
 
 //
diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 4f8db5004..56efe5a08 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -622,10 +622,11 @@ if ($e107_popup != 1) {
 		if(file_exists(e_BASE.'install.php')){ echo "<div class='installer'><br /><b>*** ".CORE_LAN4." ***</b><br />".CORE_LAN5."</div><br /><br />"; }
 	}
 
-// Display Welcome Message when old method activated.
-
-	echo $e107->tp->parseTemplate("{WMESSAGE=header}");
-
+	// Display Welcome Message when old method activated.
+	if(!strstr($HEADER,"{WMESSAGE")===false && !strstr($FOOTER,"{WMESSAGE")===false) // Auto-detection to override old pref. 
+	{
+		echo e107::getParser()->parseTemplate("{WMESSAGE}");
+	}
 
 
 	if(defined("PREVIEWTHEME"))