diff --git a/bootstrap.php b/bootstrap.php
index 41cd7cf4f5d700772919a697182d4eb50f882f1f..145918c87800867cfa3ce557e67eaf755419f32f 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -199,6 +199,9 @@ class Bootstrap {
}
function i18n_prep() {
+ ini_set('default_charset', 'utf-8');
+ ini_set('output_encoding', 'utf-8');
+
// MPDF requires mbstring functions
if (!extension_loaded('mbstring')) {
if (function_exists('iconv')) {
diff --git a/include/client/header.inc.php b/include/client/header.inc.php
index 5d369f63e3d1c744f8ad507207dfa9e883587961..14dc65411cd81ae7926ac07c7fc9593f42f654c6 100644
--- a/include/client/header.inc.php
+++ b/include/client/header.inc.php
@@ -5,7 +5,7 @@ $signin_url = ROOT_PATH . "login.php"
. ($thisclient ? "?e=".urlencode($thisclient->getEmail()) : "");
$signout_url = ROOT_PATH . "logout.php?auth=".$ost->getLinkToken();
-header("Content-Type: text/html; charset=UTF-8\r\n");
+header("Content-Type: text/html; charset=UTF-8");
?>
<!DOCTYPE html>
<html <?php
diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php
index 390987af0cb1cb5923d120a356e74ecde15c151e..7604e259c213c1037dd922984c6c90b13a4cfa5a 100644
--- a/include/staff/header.inc.php
+++ b/include/staff/header.inc.php
@@ -1,4 +1,6 @@
-<?php if (!isset($_SERVER['HTTP_X_PJAX'])) { ?>
+<?php
+header("Content-Type: text/html; charset=UTF-8");
+if (!isset($_SERVER['HTTP_X_PJAX'])) { ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html <?php
if (($lang = Internationalization::getCurrentLanguage())