diff --git a/masterserver/web/index.php b/masterserver/web/index.php
index 658a5f1c3..178dbbda6 100644
--- a/masterserver/web/index.php
+++ b/masterserver/web/index.php
@@ -14,14 +14,13 @@ header('Content-Type: text/html; charset=utf-8'); //utf-8
 require_once('frontend.php');
 
 ?>
-<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>
+<!doctype html>
 <html>
     <head>
         <title>OpenClonk Masterserver</title>
-        <meta http-equiv='content-type' content='text/html; charset=utf-8'>
-        <meta http-equiv='content-style-type' content='text/css'>
-        <link rel='stylesheet' href='masterserver.css' type='text/css'>
-        <link rel='stylesheet' href='http://www.openclonk.org/header/header.css' type='text/css'>
+        <meta charset='utf-8'>
+        <link rel='stylesheet' href='masterserver.css'>
+        <link rel='stylesheet' href='http://www.openclonk.org/header/header.css'>
     </head>
     <body>
 		<?php include("http://www.openclonk.org/header/header.php?p=masterserver"); ?>
@@ -44,4 +43,4 @@ require_once('frontend.php');
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/masterserver/web/server/include/C4Network.php b/masterserver/web/server/include/C4Network.php
index 009290824..077673904 100644
--- a/masterserver/web/server/include/C4Network.php
+++ b/masterserver/web/server/include/C4Network.php
@@ -73,7 +73,7 @@ abstract class C4Network {
     public static function decodeEntitiyString($string) {
         $num = ereg_replace("[^0-9]", "", $string);
         $num = octdec($num);
-        return iconv('Windows-1252', 'UTF-8', chr($num));
+        return chr($num);
     }
 }
-?>
\ No newline at end of file
+?>
