diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js
index cb1455a1..71fef6f3 100644
--- a/wise-webapp/src/main/webapp/js/mindmapList.js
+++ b/wise-webapp/src/main/webapp/js/mindmapList.js
@@ -344,7 +344,7 @@ $(function() {
     $("#newBtn").click(
         function() {
             $("#new-dialog-modal").dialogForm({
-                redirect: "c/maps/{header.resourceId}/edit",
+                redirect: "/c/maps/{header.resourceId}/edit",
                 url :  "../service/maps"
             });
         });
@@ -364,7 +364,7 @@ $(function() {
 
             // Initialize dialog ...
             $("#duplicate-dialog-modal").dialogForm({
-                redirect: "c/maps/{header.resourceId}/edit",
+                redirect: "/c/maps/{header.resourceId}/edit",
                 url :  "../service/maps/" + mapId
             });
         }
diff --git a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
index fcd79e35..5279ba38 100644
--- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
+++ b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
@@ -8,7 +8,7 @@
 
 <html>
 <head>
-    <base href="${pageContext.request.contextPath}/"/>
+    <base href="${baseURL}/">
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <!--[if lt IE 9]>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
diff --git a/wise-webapp/src/main/webapp/jsp/init.jsp b/wise-webapp/src/main/webapp/jsp/init.jsp
index 0ba722e3..5c3e521f 100644
--- a/wise-webapp/src/main/webapp/jsp/init.jsp
+++ b/wise-webapp/src/main/webapp/jsp/init.jsp
@@ -1,13 +1,8 @@
-<%@ page import="com.wisemapping.model.User" %>
-<%@ page import="com.wisemapping.security.Utils" %>
-<%@ page import="com.wisemapping.filter.UserAgent" %>
-<%@ page import="com.wisemapping.filter.BrowserSupportInterceptor" %>
 <%@ page session="false" contentType="text/html;charset=UTF-8" %>
-
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%
-    User user = Utils.getUser(false);
-    request.setAttribute("principal", user);
-%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<c:set var="baseURL" value="${fn:replace(pageContext.request.requestURL, pageContext.request.requestURI, pageContext.request.contextPath)}" />
+
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index f2ee337d..626dd1d8 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -8,7 +8,7 @@
 <%@ include file="/jsp/init.jsp" %>
 <html>
 <head>
-    <base href="${pageContext.request.contextPath}/"/>
+    <base href="${baseURL}/">
     <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
     <!--[if lt IE 9]>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
index ee895b78..81dbbe5d 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
@@ -14,7 +14,7 @@
 
 <html>
 <head>
-    <base href="${pageContext.request.contextPath}/"/>
+    <base href="${baseURL}/">
     <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
 
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index fc0d9103..0c44e1e3 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -3,15 +3,15 @@
 <%@ include file="/jsp/init.jsp" %>
 <html>
 <head>
-    <base href="${pageContext.request.contextPath}/"/>
+    <base href="${baseURL}">
     <title><spring:message code="SITE.TITLE"/></title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <!--[if lt IE 9]>
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <![endif]-->
 
-    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
+    <link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
 
     <link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/>
 
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
index 10577d12..d0de6ee2 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -10,7 +10,7 @@
 
 <html>
 <head>
-    <base href="${pageContext.request.contextPath}/"/>
+    <base href="${baseURL}/">
     <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
 
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp
index 9aee940d..4b5766b4 100644
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -8,7 +8,7 @@
 <tiles:importAttribute name="details" scope="request"/>
 <html>
 <head>
-    <base href="${pageContext.request.contextPath}/"/>
+    <base href="${baseURL}/">
     <title>
         <spring:message code="SITE.TITLE"/>
         -
@@ -24,8 +24,8 @@
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="css/pageTemplate.css"/>
 
-    <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
+    <link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
 
     <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
     <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
