diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 4dcbd6949..aecb2f8d1 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -538,13 +538,17 @@ TMPO;
 
 	private function checkDeveloperMode()
 	{
-		if(deftrue('e_DEVELOPER') && (strpos(e_SELF,'localhost') === false) && (strpos(e_SELF,'127.0.0.1') === false))
+		$pref 	= e107::getPref();
+		$tp 	= e107::getParser();
+
+		if($pref['developer'] && (strpos(e_SELF,'localhost') === false) && (strpos(e_SELF,'127.0.0.1') === false))
 		{
-			e107::getMessage()->addWarning(LAN_DEVELOPERMODE_CHECK);
+			e107::getMessage()->addWarning($tp->toHTML(LAN_DEVELOPERMODE_CHECK, true));
 		}
 	}
 
 
+
 	private function checkDependencies()
 	{
 
diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 2c731b387..8fd7dcd34 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -783,13 +783,11 @@ if ($e107_popup != 1) {
 		 echo "<div class='installer alert alert-danger alert-block text-center'><b>*** ".CORE_LAN4." ***</b><br />".CORE_LAN5."</div>"; 
 	}
 
-	if(ADMIN && deftrue('e_DEVELOPER') && (strpos(e_SELF,'localhost') === false) && (strpos(e_SELF,'127.0.0.1') === false))
+	if(ADMIN && $pref['developer'] && (strpos(e_SELF,'localhost') === false) && (strpos(e_SELF,'127.0.0.1') === false))
 	{
-		echo "<div class='installer alert alert-danger alert-block text-center'>".LAN_DEVELOPERMODE_CHECK."</div>";
+		echo "<div class='installer alert alert-danger alert-block text-center'>".e107::getParser()->toHTML(LAN_DEVELOPERMODE_CHECK, true)."</div>";
 	}
 
-
-
 	
 	//XXX TODO LAN in English.php 
 	echo "<noscript><div class='alert alert-block alert-error alert-danger'><strong>This web site requires that javascript be enabled. <a rel='external' href='http://activatejavascript.org'>Click here for instructions.</a>.</strong></div></noscript>";
diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index e10c1f003..b111734f5 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -148,4 +148,4 @@ define("LAN_CHOOSE_FILE", "Choose a file");
 
 define("LAN_REQUIRED", "Required");
 
-define("LAN_DEVELOPERMODE_CHECK", "Developer mode is enabled. Only use this mode when actually developing. Make sure to disable when using this website in live production.");
\ No newline at end of file
+define("LAN_DEVELOPERMODE_CHECK", "[b]Developer mode is currently enabled. Use this mode only when developing![/b] [br]Please disable developer mode when using your website in live production. When developer mode is enabled, sensitive information may be shown to the public!");
\ No newline at end of file