Index: branches/5.0.x/elements/html_head.elm.tpl
===================================================================
diff -u -N -r12933 -r13005
--- branches/5.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 12933)
+++ branches/5.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13005)
@@ -1,7 +1,18 @@
-<meta http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
+<inp2:m_if check="c.current_Field" name="MetaKeywords">
+	<meta name="Keywords" content="<inp2:c.current_Field name='MetaKeywords'/>"/>
+<inp2:m_else/>
+	<meta name="Keywords" content="<inp2:m_GetConfig name='Category_MetaKey'/>"/>
+</inp2:m_if>
+<inp2:m_if check="c.current_Field" name="MetaDescription">
+	<meta name="Description" content="<inp2:c.current_Field name='MetaDescription'/>"/>
+<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 http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
 
 <!-- CSS -->
-<link rel="stylesheet" type="text/css" href="<inp2:m_TemplatesBase />inc/screen.css" media="screen" charset="utf-8"/>
+<link rel="stylesheet" type="text/css" href="<inp2:m_TemplatesBase />inc/screen.css" media="screen" charset="<inp2:lang.current_Field name='Charset'/>"/>
 
 <!-- JS FOR ADMIN -->
 <inp2:st_EditingScripts/>