diff --git a/Havana-Server/src/main/java/org/alexdev/havana/util/config/ServerConfiguration.java b/Havana-Server/src/main/java/org/alexdev/havana/util/config/ServerConfiguration.java
index 1394608..d37d96f 100644
--- a/Havana-Server/src/main/java/org/alexdev/havana/util/config/ServerConfiguration.java
+++ b/Havana-Server/src/main/java/org/alexdev/havana/util/config/ServerConfiguration.java
@@ -158,7 +158,7 @@ public class ServerConfiguration {
      * @return value
      */
     public static String getString(String key) {
-        return config.getOrDefault(key, key);
+        return config.getOrDefault(key, "");
     }
 
     /**
diff --git a/Havana-Web/libs/duckHTTPD-all.jar b/Havana-Web/libs/duckHTTPD-all.jar
index d0e21a4..3bbf395 100644
Binary files a/Havana-Web/libs/duckHTTPD-all.jar and b/Havana-Web/libs/duckHTTPD-all.jar differ
diff --git a/Havana-Web/src/main/java/org/alexdev/http/HavanaWeb.java b/Havana-Web/src/main/java/org/alexdev/http/HavanaWeb.java
index 1030421..b509f5d 100644
--- a/Havana-Web/src/main/java/org/alexdev/http/HavanaWeb.java
+++ b/Havana-Web/src/main/java/org/alexdev/http/HavanaWeb.java
@@ -52,6 +52,10 @@ public class HavanaWeb {
         settings.setTemplateBase(TwigTemplate.class);
         settings.setSaveSessions(true);
 
+        if (ServerConfiguration.getString("page.encoding").length() > 0) {
+            settings.setPageEncoding(ServerConfiguration.getString("page.encoding"));
+        }
+
         // Spammers
         /*Settings.getInstance().getBlockIpv4().add("192.190");
         Settings.getInstance().getBlockIpv4().add("79.108");
diff --git a/Havana-Web/src/main/java/org/alexdev/http/util/config/WebServerConfigWriter.java b/Havana-Web/src/main/java/org/alexdev/http/util/config/WebServerConfigWriter.java
index 85bd901..f76435d 100644
--- a/Havana-Web/src/main/java/org/alexdev/http/util/config/WebServerConfigWriter.java
+++ b/Havana-Web/src/main/java/org/alexdev/http/util/config/WebServerConfigWriter.java
@@ -27,6 +27,8 @@ public class WebServerConfigWriter implements ConfigWriter {
 
         config.put("template.directory", "tools/www-tpl");
         config.put("template.name", "default-en");
+
+        config.put("page.encoding", "utf-8");
         return config;
     }
 
@@ -53,6 +55,8 @@ public class WebServerConfigWriter implements ConfigWriter {
         writer.println("[Template]");
         writer.println("template.directory=" + config.get("template.directory"));
         writer.println("template.name=" + config.get("template.name"));
+        writer.println("");
+        writer.println("page.encoding=" + config.get("page.encoding"));
         writer.flush();
         writer.close();
     }