diff --git a/cli-script.php b/cli-script.php
index a65baaa90..7969a880c 100755
--- a/cli-script.php
+++ b/cli-script.php
@@ -61,6 +61,12 @@ if(isset($_SERVER['argv'][1])) {
  */
 require_once("core/Core.php");
 
+if(function_exists('mb_http_output')) {
+	mb_http_output('UTF-8');
+	mb_internal_encoding('UTF-8');
+	mb_regex_encoding('UTF-8');
+}
+
 global $databaseConfig;
 
 // We don't have a session in cli-script, but this prevents errors
diff --git a/main.php b/main.php
index a5bd3801b..60bed156f 100644
--- a/main.php
+++ b/main.php
@@ -63,6 +63,7 @@ require_once("core/Core.php");
 if (function_exists('mb_http_output')) {
 	mb_http_output('UTF-8');
 	mb_internal_encoding('UTF-8');
+	mb_regex_encoding('UTF-8');
 }
 
 Session::start();