Index: lams_tool_daco/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r3bdebf472590492a1e54e2495e1b566449e5ea4a -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 3bdebf472590492a1e54e2495e1b566449e5ea4a)
+++ lams_tool_daco/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -36,11 +36,11 @@
 	<table>
 		<tr>
 			<td>
-			<h1>${daco.title}</h1>
+			<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
 			</td>
 		</tr>
 		<tr>
-			<td>${daco.instructions}</td>
+			<td><c:out value-"${daco.instructions}" escapeXml="false"/></td>
 		</tr>
 	</table>
 	<c:choose>
@@ -51,14 +51,14 @@
 			<%@ include file="/pages/learning/questionSummaries.jsp" %>
 			<c:if test="${daco.reflectOnActivity}">
 				<div>
-					<h2>${daco.reflectInstructions }</h2>
+					<h2><lams:out value="${daco.reflectInstructions}" escapeHtml="true"/></h2>
 					<p>
 						<c:choose>
 							<c:when test="${empty reflectEntry}">
 								<fmt:message key="message.no.reflection.available" />
 							</c:when>
 							<c:otherwise>
-								${reflectEntry}
+								<lams:out value="${reflectEntry}" escapeHtml="true"/>
 							</c:otherwise>
 						</c:choose>
 					</p>
@@ -82,7 +82,6 @@
 							<table cellpadding="0" class="alternative-color">
 								<tr>
 									<th><fmt:message key="label.monitoring.fullname" /></th>
-									<th><fmt:message key="label.monitoring.loginname" /></th>
 									<th><fmt:message key="label.monitoring.recordcount" /></th>
 									<th><fmt:message key="label.monitoring.notebook" /></th>
 								</tr>
@@ -95,11 +94,8 @@
 								</c:if>
 								<tr>
 									<td>
-										 ${user.fullName}
+										 <c:out value="${user.fullName}" escapeXml="true"/>
 									</td>
-									<td>
-										 ${user.loginName}
-									</td>
 									<td style="text-align: center; font-weight: bold;">
 										<c:choose>
 											<c:when test="${user.recordCount > 0}">
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -rdacc95597e76d3f1573c0fdd2cef0eb126b6dd3a -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision dacc95597e76d3f1573c0fdd2cef0eb126b6dd3a)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -24,11 +24,11 @@
 <table>
 	<tr>
 		<td>
-		<h1>${daco.title}</h1>
+		<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
 		</td>
 	</tr>
 	<tr>
-		<td>${daco.instructions}</td>
+		<td><c:out value="${daco.instructions}" escapeXml="false"/></td>
 	</tr>
 </table>
 <c:if test="${not finishedLock }">
@@ -65,7 +65,7 @@
 				<tr>
 					<td>
 					<div class="bigNumber">${questionStatus.index+1}</div>
-					${question.description}
+					<c:out value="${question.description}" escapeXml="false"/>
 					<c:choose>
 						<%-- The content varies depending on the question type --%>
 						<c:when test="${question.type==1}"><%-- Single line text --%>
@@ -153,7 +153,7 @@
 							</c:if>
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 							<%-- It displays for example A) instead of 1) --%>
-							${fn:substring(ordinal,status.index,status.index+1)}) <html:radio property="answer[${answerIndex}]" value="${status.index+1}">${answerOption.answerOption}</html:radio><br />
+							${fn:substring(ordinal,status.index,status.index+1)}) <html:radio property="answer[${answerIndex}]" value="${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></html:radio><br />
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
@@ -165,7 +165,7 @@
 							<html:select property="answer[${answerIndex}]">
 							<html:option value="0"><fmt:message key="label.learning.dropdown.select" /></html:option>
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
-								<html:option value="${status.index+1}">${answerOption.answerOption}</html:option>
+								<html:option value="${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></html:option>
 							</c:forEach>
 							</html:select>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
@@ -179,7 +179,7 @@
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 							${fn:substring(ordinal,status.index,status.index+1)})
 							<input type="checkbox" id="checkbox-${questionStatus.index+1}-${status.index+1}" value="${status.index+1}">
-								${answerOption.answerOption}
+								<c:out value="${answerOption.answerOption}" escapeXml="true"/>
 							</input><br />
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
@@ -249,4 +249,4 @@
 		</c:if>
 	</p>
 </c:if>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
diff -u -rdacc95597e76d3f1573c0fdd2cef0eb126b6dd3a -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision dacc95597e76d3f1573c0fdd2cef0eb126b6dd3a)
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -49,11 +49,11 @@
 	<table>
 		<tr>
 			<td>
-			<h1>${daco.title}</h1>
+			<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
 			</td>
 		</tr>
 		<tr>
-			<td>${daco.instructions}</td>
+			<td><c:out value="${daco.instructions}" escapeXml="false"/></td>
 		</tr>
 	</table>
 </c:if>
@@ -108,7 +108,7 @@
 							<tr>
 								<td class="fixedCellHeight" style="width: 160px">
 									<div class="bigNumber">${questionStatus.index+1}</div>
-									${question.description}
+									<c:out value="${question.description}" escapeXml="false"/>
 								</td>	
 							</tr>
 						</c:forEach>
@@ -187,7 +187,7 @@
 										<tr>
 											<td>
 											<div class="bigNumber">${questionStatus.index+1}</div>
-											${question.description}
+											<c:out value="${question.description}" escapeXml="false"/>
 											<c:choose>
 												<c:when test="${question.type==1}">
 													<input type="text" size="72" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
@@ -244,7 +244,7 @@
 														checked="checked"
 														</c:if>
 														>
-														${answerOption.answerOption}</input><br />
+														<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 													</c:forEach>
 												</c:when>
 												<c:when test="${question.type==8}">
@@ -255,15 +255,15 @@
 														<c:otherwise>
 															<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 																<c:if test="${status.index+1==answer.answer}">
-																	<fmt:message key="label.learning.dropdown.selected" /> ${answerOption.answerOption}
+																	<fmt:message key="label.learning.dropdown.selected" /> <c:out value="${answerOption.answerOption}" escapeXml="true"/>
 																</c:if>
 															</c:forEach>
 														</c:otherwise>
 													</c:choose>
 												</c:when>
 												<c:when test="${question.type==9}">
 													<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
-														<input type="checkbox" disabled="disabled" id="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">${answerOption.answerOption}</input><br />
+														<input type="checkbox" disabled="disabled" id="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 													</c:forEach>
 												</c:when>
 												<c:when test="${question.type==10}">
@@ -316,4 +316,4 @@
 		</c:choose>
 	</c:otherwise>
 </c:choose>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
diff -u -re2ad283a47e0f3e72fa10507f0678781a236521c -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision e2ad283a47e0f3e72fa10507f0678781a236521c)
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -197,7 +197,7 @@
 																checked="checked"
 																</c:if>
 																>
-																${answerOption.answerOption}</input><br />
+																<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 															</c:forEach>
 														</td>
 													</tr>
@@ -211,7 +211,7 @@
 													<c:otherwise>
 														<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 															<c:if test="${status.index+1==answer.answer}">
-																<fmt:message key="label.learning.dropdown.selected" /> ${answerOption.answerOption}
+																<fmt:message key="label.learning.dropdown.selected" /> <c:out value="${answerOption.answerOption}" escapeXml="true"/>
 															</c:if>
 														</c:forEach>
 													</c:otherwise>
@@ -226,7 +226,7 @@
 																	</td>
 																	<td>
 																</c:if>
-																<input type="checkbox" disabled="disabled" id="checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">${answerOption.answerOption}</input><br />
+																<input type="checkbox" disabled="disabled" id="checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 															</c:forEach>
 														</td>
 													</tr>
@@ -276,4 +276,4 @@
 		</c:forEach>
 	</table>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -27,13 +27,13 @@
 		
 		<div id="content">
 			<h1>
-				${daco.title}
+				<c:out value="${daco.title}" escapeXml="true"/>
 			</h1>
 
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
-				<lams:out value="${daco.reflectInstructions}" />
+				<lams:out value="${daco.reflectInstructions}" escapeHtml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
diff -u -r3bdebf472590492a1e54e2495e1b566449e5ea4a -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision 3bdebf472590492a1e54e2495e1b566449e5ea4a)
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -26,11 +26,11 @@
 	<table>
 		<tr>
 			<td>
-			<h1>${daco.title}</h1>
+			<h1><c:out value="${daco.title}" escapeXml="true"/></h1>
 			</td>
 		</tr>
 		<tr>
-			<td>${daco.instructions}</td>
+			<td><c:out value="${daco.instructions}" escapeXml="false"/></td>
 		</tr>
 	</table>
 </c:if>
@@ -47,7 +47,7 @@
 				<fmt:message key="label.learning.tableheader.summary.learner" />
 			</c:when>
 			<c:otherwise>
-				${userFullName}
+				<c:out value="${userFullName}" escapeXml="true"/>
 			</c:otherwise>
 		</c:choose>
 		</th>
@@ -69,7 +69,7 @@
 		<tr>
 			<td>
 				<div class="bigNumber">${questionStatus.index+1}</div>
-				${question.description}
+				<c:out value="${question.description}" escapeXml="false"/>
 				<div class="hint">
 					<c:choose>
 						<c:when test="${question.summary==1}">
@@ -227,4 +227,4 @@
 		<a href="#" class="button" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
 	</p>
 </c:if>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_daco/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 843648563725cffa91af1dfd96dce9682d39b410)
+++ lams_tool_daco/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${daco.title}" escapeXml="false" />
+			<c:out value="${daco.title}" escapeXml="true" />
 		</td>
 	</tr>
 
@@ -41,4 +41,4 @@
 			</td>
 		</tr>
 	</c:if>
-</table>
\ No newline at end of file
+</table>
Index: lams_tool_daco/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 843648563725cffa91af1dfd96dce9682d39b410)
+++ lams_tool_daco/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -27,14 +27,14 @@
 				<table class="alternative-color" cellspacing="0">
 					<tr>
 						<th class="first">
-							<lams:out value="${daco.reflectInstructions}"/>
+							<lams:out value="${daco.reflectInstructions}" escapeHtml="true"/>
 						</th>
 					</tr>
 					<tr>
 						<td>
 							<c:choose>
 								<c:when test="${not empty user.reflectionEntry}">
-									<lams:out value="${user.reflectionEntry}"/>
+									<lams:out value="${user.reflectionEntry}" escapeHtml="true"/>
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="message.no.reflection.available" />
Index: lams_tool_daco/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r5340a74cf11fbd5145b1a7d2d42697587b1bbea4 -re101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0
--- lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 5340a74cf11fbd5145b1a7d2d42697587b1bbea4)
+++ lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision e101d0a2cb3707a0d566c12d0c59c8ec1bbac3b0)
@@ -121,7 +121,7 @@
 					<fmt:message key="label.monitoring.advancedsettings.notebookinstructions" />
 				</td>
 				<td>
-					${daco.reflectInstructions}	
+					<lams:out value="${daco.reflectInstructions}" escapeHtml="true"/>
 				</td>
 			</tr>
 		</c:if>
@@ -219,4 +219,4 @@
 		</html:link>
 		
 	</c:if>
-</p>
\ No newline at end of file
+</p>