diff --git a/e107_admin/header.php b/e107_admin/header.php
index 6c02a1155..c47b69f6c 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -2,16 +2,14 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2012 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Admin Header
  *
- * $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
 */
 
 if (!defined('e107_INIT'))
@@ -206,6 +204,12 @@ if ((isset($pref['enable_png_image_fix']) && $pref['enable_png_image_fix'] == tr
 	echo "<![endif]-->\n";
 }
 
+
+//
+// Unobtrusive JS via CSS, prevent 3rd party code overload
+//
+require_once(e_FILE."/e_css.php");
+
 //
 // E: Send JS
 //
@@ -361,11 +365,6 @@ echo "
 e107::getJs()->renderJs('header', 5);
 e107::getJs()->renderJs('header_inline', 5);
 
-//
-// Unobtrusive JS via CSS, prevent 3rd party code overload
-//
-require_once(e_FILE."/e_css.php");
-
 /*
  * Fire Event e107:loaded
  * TODO - remove it from here, should be registered to e_jsmanager
@@ -373,6 +372,7 @@ require_once(e_FILE."/e_css.php");
  */
 echo "<script type='text/javascript'>\n";
 echo "<!--\n";
+echo "\$('e-js-css').remove();\n"; // unobtrusive JS - moved here from external e_css.php
 echo "document.observe('dom:loaded', function () {\n";
 echo "e107Event.trigger('loaded', null, document);\n";
 echo "});\n";
diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php
index 0c9e9dc33..4ef5893e5 100644
--- a/e107_themes/templates/header_default.php
+++ b/e107_themes/templates/header_default.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2011 e107 Inc (e107.org)
+ * Copyright (C) 2008-2012 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -494,7 +494,7 @@ if (count($js_body_onload)) $body_onload = " onload=\"".implode(" ",$js_body_onl
  */
 echo "<script type='text/javascript'>\n";
 echo "<!--\n";
-echo "$('e-js-css').remove();\n"; // unobtrusive JS - moved here from external e_css.php
+echo "\$('e-js-css').remove();\n"; // unobtrusive JS - moved here from external e_css.php
 echo "document.observe('dom:loaded', function() {\n";
 echo "e107Event.trigger('loaded', {element: null}, document);\n";
 echo "});\n";