diff --git a/mod/layout/class/Layout.php b/mod/layout/class/Layout.php
index 492f49a27..e2ca3acab 100644
--- a/mod/layout/class/Layout.php
+++ b/mod/layout/class/Layout.php
@@ -585,7 +585,7 @@ public static function getMetaTags($page_metatags = null)
         // Say it loud
         $metatags[] = '<meta name="generator" content="phpWebSite" />';
 
-        $metatags[] = '<meta content="text/html; charset=UTF-8"  http-equiv="Content-Type" />';
+        $metatags[] = '<meta charset="utf-8" />';
         if (!empty($author)) {
             $metatags[] = '<meta name="author" content="' . $meta_author . '" />';
         } else {
@@ -919,7 +919,7 @@ public static function loadHeaderTags(&$template)
         }
 
         if (!isset($_SESSION['javascript_enabled'])) {
-            $jsHead[] = '<noscript><meta http-equiv="refresh" content="0;url=index.php?nojs=1&ret=' . urlencode(\phpws\PHPWS_Core::getCurrentUrl()) . '"/></noscript>';
+            $jsHead[] = '<noscript><meta http-equiv="refresh" content="0; url=index.php?nojs=1&ret=' . urlencode(\phpws\PHPWS_Core::getCurrentUrl()) . '"/></noscript>';
         }
 
         if (isset($_GET['nojs'])) {