diff --git a/account-ui/pom.xml b/account-ui/pom.xml
index a0c4c76..ed320df 100644
--- a/account-ui/pom.xml
+++ b/account-ui/pom.xml
@@ -124,6 +124,7 @@
                             <filtering>true</filtering>  
                             <includes>  
                                 <include>WEB-INF/web.xml</include>  
+                                <include>WEB-INF/jboss-web.xml</include>  
                                 <include>WEB-INF/shiro.ini</include>
                             </includes>  
                         </resource>      
diff --git a/account-ui/src/main/filters/development.properties b/account-ui/src/main/filters/development.properties
index c37b080..ef4d834 100644
--- a/account-ui/src/main/filters/development.properties
+++ b/account-ui/src/main/filters/development.properties
@@ -1,4 +1,5 @@
 jsf.projectStage=Development
+context.root=account
 
 shiro.contextFactory = # not defined
 shiro.passwordMatcher= passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher${line.separator}passwordMatcher.passwordService = $passwordService
diff --git a/account-ui/src/main/filters/production.properties b/account-ui/src/main/filters/production.properties
index c413bb0..ec870b7 100644
--- a/account-ui/src/main/filters/production.properties
+++ b/account-ui/src/main/filters/production.properties
@@ -1,4 +1,5 @@
 jsf.projectStage=Production
+context.root=account
 
 ldap.url = ldaps://host:port
 ## we will use provided username / password from webapplication
diff --git a/account-ui/src/main/webapp/WEB-INF/jboss-web.xml b/account-ui/src/main/webapp/WEB-INF/jboss-web.xml
new file mode 100644
index 0000000..f1fdbb4
--- /dev/null
+++ b/account-ui/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web version="10.0"
+           xmlns="http://www.jboss.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_7_2.xsd">
+    <context-root>${context.root}</context-root>
+</jboss-web>
\ No newline at end of file
diff --git a/account-ui/src/main/webapp/index.xhtml b/account-ui/src/main/webapp/index.xhtml
index ac83f88..67d8f87 100644
--- a/account-ui/src/main/webapp/index.xhtml
+++ b/account-ui/src/main/webapp/index.xhtml
@@ -2,7 +2,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:p="http://primefaces.org/ui"
-                template="/resources/templates/template.xhtml"
+                template="/resources/template/template.xhtml"
                 xmlns:h="http://xmlns.jcp.org/jsf/html"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:shiro="http://shiro.apache.org/tags">