diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
index 3b2f84d32..5cf554701 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
 <jboss-web>
     <context-root>/libreccm</context-root>
+    <default-encoding>UTF-8</default-encoding>
 </jboss-web>
diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
index a42350b9f..a3c67e4f7 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
@@ -69,6 +69,10 @@
         <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
         <param-value>true</param-value>
     </context-param>
+    <context-param>
+        <param-name>PARAMETER_ENCODING</param-name>
+        <param-value>UTF-8</param-value>
+    </context-param>
     
     <!--    <servlet>
         <servlet-name>vaadin-servlet</servlet-name>