Index: branches/1.0.x/elements/html_head.elm.tpl
===================================================================
diff -u -N -r15169 -r15321
--- branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 15169)
+++ branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 15321)
@@ -8,7 +8,7 @@
 <inp2:m_else/>
 	<meta name="Description" content="<inp2:m_GetConfig name='Category_MetaDesc'/>"/>
 </inp2:m_if>
-<meta name="author" content="<inp2:m_GetConfig name='Site_Name'/>"/>
+<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'/>" />
 
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r15169 -r15321
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 15169)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 15321)
@@ -6,7 +6,7 @@
 </inp2:m_if>
 
 	<div class="logo">
-		<a href="<inp2:m_Link template='index' m_cat_id='0' />"><img src="<inp2:m_TemplatesBase/>img/logo.jpg" width="238" height="79" alt="<inp2:m_GetConfig name='Site_Name'/>" /></a>
+		<a href="<inp2:m_Link template='index' m_cat_id='0' />"><img src="<inp2:m_TemplatesBase/>img/logo.jpg" width="238" height="79" alt="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>" /></a>
 		<inp2:st_ContentBlock num="100" page="index"/>
 	</div>
 	<div class="infoblock">