diff --git a/src/main/java/se/su/dsv/scipro/SciProApplication.java b/src/main/java/se/su/dsv/scipro/SciProApplication.java
index 93c47a18e9..141b06ef9c 100644
--- a/src/main/java/se/su/dsv/scipro/SciProApplication.java
+++ b/src/main/java/se/su/dsv/scipro/SciProApplication.java
@@ -52,6 +52,12 @@ public class SciProApplication extends WebApplication {
 		
 		setKerberosConfigs();
 		
+		getMarkupSettings().setCompressWhitespace(true);
+		getMarkupSettings().setStripComments(true);
+		getMarkupSettings().setStripWicketTags(true);
+		getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
+		getRequestCycleSettings().setResponseRequestEncoding("UTF-8");
+		
 		mountBookmarkablePage("event", EventPage.class);
 		mountBookmarkablePage("login", LoginPage.class);
 		mountBookmarkablePage("logout", LogoutPage.class);