Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rc43fd06c63eb2356b9a7b068285194a2c8d52711
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c43fd06c63eb2356b9a7b068285194a2c8d52711)
@@ -8,8 +8,13 @@
 
 <script type="text/javascript">
 //<![CDATA[  
-	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", dictionary: "${localizationPath}" }
+           
+    <c:set var="MindmapUser">
+		<c:out value="${currentMindmapUser}" escapeXml="true"/>
+	</c:set>
 	
+	flashvars = { xml: "${mindmapContentPath}", user: "${MindmapUser}", dictionary: "${localizationPath}" }
+	
 	$(window).resize(makeNice);
 	
 	embedFlashObject(700, 525);
Index: lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp
===================================================================
diff -u -rdbadec7747ba50b996bd7537305023d25546e96d -rc43fd06c63eb2356b9a7b068285194a2c8d52711
--- lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp	(.../exportPortfolioMultimode.jsp)	(revision dbadec7747ba50b996bd7537305023d25546e96d)
+++ lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp	(.../exportPortfolioMultimode.jsp)	(revision c43fd06c63eb2356b9a7b068285194a2c8d52711)
@@ -7,9 +7,14 @@
 <script type="text/javascript" src="jquery.js"></script>
 
 <script type="text/javascript">
+
 <!--
-	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", dictionary: "${localizationPath}" }
+	<c:set var="MindmapUser">
+		<c:out value="${currentMindmapUser}" escapeXml="true"/>
+	</c:set>
 	
+	flashvars = { xml: "${mindmapContentPath}", user: "${MindmapUser}", dictionary: "${localizationPath}" }
+	
 	$(window).resize(makeNice);
 
 	embedFlashObject(700, 525);
Index: lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp
===================================================================
diff -u -rdbadec7747ba50b996bd7537305023d25546e96d -rc43fd06c63eb2356b9a7b068285194a2c8d52711
--- lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp	(.../exportPortfolioSinglemode.jsp)	(revision dbadec7747ba50b996bd7537305023d25546e96d)
+++ lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp	(.../exportPortfolioSinglemode.jsp)	(revision c43fd06c63eb2356b9a7b068285194a2c8d52711)
@@ -8,7 +8,11 @@
 
 <script type="text/javascript">
 <!--
-	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", dictionary: "${localizationPath}" }
+	<c:set var="MindmapUser">
+		<c:out value="${currentMindmapUser}" escapeXml="true"/>
+	</c:set>
+
+	flashvars = { xml: "${mindmapContentPath}", user: "${MindmapUser}", dictionary: "${localizationPath}" }
 	
 	$(window).resize(makeNice);
 
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -r070a0493e006b9e6407f000280fd0c94673bf2e8 -rc43fd06c63eb2356b9a7b068285194a2c8d52711
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 070a0493e006b9e6407f000280fd0c94673bf2e8)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision c43fd06c63eb2356b9a7b068285194a2c8d52711)
@@ -35,7 +35,11 @@
 		disableFinishButton();
 	}
 	
-	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", 
+	<c:set var="MindmapUser">
+		<c:out value="${currentMindmapUser}" escapeXml="true"/>
+	</c:set>
+	
+	flashvars = { xml: "${mindmapContentPath}", user: "${MindmapUser}", 
 				  pollServer: "${pollServerParam}", notifyServer: "${notifyServerParam}",
 				  dictionary: "${localizationPath}" }
 	
Index: lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
===================================================================
diff -u -r1420c1000e389cc9a29b3b3d37d2ec63ae735e2d -rc43fd06c63eb2356b9a7b068285194a2c8d52711
--- lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision 1420c1000e389cc9a29b3b3d37d2ec63ae735e2d)
+++ lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision c43fd06c63eb2356b9a7b068285194a2c8d52711)
@@ -6,8 +6,13 @@
 
 <script type="text/javascript">
 //<![CDATA[
-	flashvars = { xml: "${mindmapContentPath}", user: "${currentMindmapUser}", dictionary: "${localizationPath}" }
+           
+    <c:set var="MindmapUser">
+		<c:out value="${currentMindmapUser}" escapeXml="true"/>
+	</c:set>
 	
+	flashvars = { xml: "${mindmapContentPath}", user: "${MindmapUser}", dictionary: "${localizationPath}" }
+
 	embedFlashObject(700, 525);
 
 	$(window).resize(makeNice);
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r33930bf7e6bfcea95a0edddd72f2adb5eaad5b62 -rc43fd06c63eb2356b9a7b068285194a2c8d52711
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 33930bf7e6bfcea95a0edddd72f2adb5eaad5b62)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c43fd06c63eb2356b9a7b068285194a2c8d52711)
@@ -105,7 +105,7 @@
 		
 		<h4>
 			<fmt:message key="label.group.leader" >
-				<fmt:param>${sessionMap.groupLeaderName}</fmt:param>
+				<fmt:param><c:out value="${sessionMap.groupLeaderName}" escapeXml="true"/></fmt:param>
 			</fmt:message>
 		</h4>