Index: advanced/platform/designs/popup_design.des.tpl
===================================================================
--- advanced/platform/designs/popup_design.des.tpl	(revision 15437)
+++ advanced/platform/designs/popup_design.des.tpl	(working copy)
@@ -8,7 +8,7 @@
 		<title>
 			<inp2:m_GetConfig name="Site_Name"/>
 		</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
+		<meta http-equiv="Content-Type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
 		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
 	</head>
 	<body>
Index: advanced/platform/elements/html_head.elm.tpl
===================================================================
--- advanced/platform/elements/html_head.elm.tpl	(revision 15437)
+++ advanced/platform/elements/html_head.elm.tpl	(working copy)
@@ -1,6 +1,6 @@
 
 <!--## Meta Info (Keywords and Description) ##-->
-<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
 
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
Index: default/elements/html_head.elm.tpl
===================================================================
--- default/elements/html_head.elm.tpl	(revision 15437)
+++ default/elements/html_head.elm.tpl	(working copy)
@@ -9,13 +9,13 @@
 	<meta name="Description" content="<inp2:m_GetConfig name='Category_MetaDesc'/>"/>
 </inp2:m_if>
 <meta name="author" content="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>"/>
-<meta http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
+<meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
 
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 
 <!-- CSS -->
-<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css'/>" media="screen" charset="<inp2:lang.current_Field name='Charset'/>"/>
+<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css'/>" media="screen" charset="<inp2:m_GetConst name='CHARSET'/>"/>
 
 <!-- JS FOR ADMIN -->
 <inp2:st_EditingScripts/>
Index: simple/elements/html_head.elm.tpl
===================================================================
--- simple/elements/html_head.elm.tpl	(revision 15437)
+++ simple/elements/html_head.elm.tpl	(working copy)
@@ -9,7 +9,7 @@
 	<meta name="Description" content="<inp2:m_GetConfig name='Category_MetaDesc'/>"/>
 </inp2:m_if>
 <meta name="author" content="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>"/>
-<meta http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
+<meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
 
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
