Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -23,14 +23,17 @@
 				 	<c:set var="mediumImagePath">
 	   					<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false
 					</c:set>					
-					<a href="${mediumImagePath}" rel="lyteframe" title="${image.title}" style="border-style: none;" rev="width: ${image.mediumImageWidth + 20}px; height: ${image.mediumImageHeight + 30}px; scrolling: no;">
-						<img src="${thumbnailPath}" alt="${image.title}" style="border-style: none;"/>
+					<c:set var="title">
+						<c:out value="${image.title}" escapeXml="true"/>
+					</c:set>
+					<a href="${mediumImagePath}" rel="lyteframe" title="${title}" style="border-style: none;" rev="width: ${image.mediumImageWidth + 20}px; height: ${image.mediumImageHeight + 30}px; scrolling: no;">
+						<img src="${thumbnailPath}" alt="${title}" style="border-style: none;"/>
 					</a>
 				</td>
 				
 				<td style="vertical-align:middle;">
-					<a href="${mediumImagePath}" rel="lyteframe" title="${image.title}" rev="width: ${image.mediumImageWidth + 20}px; height: ${image.mediumImageHeight + 30}px; scrolling: auto;">
-						${image.title}
+					<a href="${mediumImagePath}" rel="lyteframe" title="${title}" rev="width: ${image.mediumImageWidth + 20}px; height: ${image.mediumImageHeight + 30}px; scrolling: auto;">
+						<c:out value="${image.title}" escapeXml="true"/>
 					</a>
 				</td>
 
Index: lams_tool_images/web/pages/export/exportimagelearner.jsp
===================================================================
diff -u -r4b47f86b588e38c9e7e9f2760c75f775cb080831 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/export/exportimagelearner.jsp	(.../exportimagelearner.jsp)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
+++ lams_tool_images/web/pages/export/exportimagelearner.jsp	(.../exportimagelearner.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -12,7 +12,7 @@
 				<c:if test="${image.createByAuthor || (image.createBy == null)}">colspan="2"</c:if>
 				 >
 					<h2>
-						<c:out value="${image.title}"></c:out>
+						<c:out value="${image.title}" escapeXml="true"/>
 					</h2>
 				</td>
 				<c:if test="${!image.createByAuthor && image.createBy != null}">
@@ -27,7 +27,7 @@
 			<tr>
 				<td colspan="2">	
 					<h2>
-						<c:out value="${image.description}" escapeXml="false"></c:out>
+						<c:out value="${image.description}" escapeXml="false"/>
 					</h2>
 				</td>
 			</tr>	
@@ -69,7 +69,7 @@
 						<th >
 							<fmt:message key="label.learning.by" />
 							<c:set var="author" value="${comment.createBy.loginName}" />
-							${author}
+							<c:out value="${author}" escapeXml="true"/>
 									-				
 							<lams:Date value="${comment.createDate}" />
 						</th>
@@ -89,4 +89,4 @@
 		<c:if test="${! status.last}"><hr></c:if> 
 		
 	</c:forEach>
-</div>		
\ No newline at end of file
+</div>		
Index: lams_tool_images/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -rde59f382658daefe4f6679aaaea621284d1c72cc -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision de59f382658daefe4f6679aaaea621284d1c72cc)
+++ lams_tool_images/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -34,9 +34,9 @@
 	
 		<div id="content">
 	
-			<h1>${title} </h1>
+			<h1><c:out value="${title}" escapeXml="true"/> </h1>
 			
-			<h1>${instructions} </h1>
+			<p><c:out value="${instructions}" escapeXml="false"/> </p>
 	
 			<c:choose>
 				<c:when test="${not empty sessionList}">
@@ -68,7 +68,7 @@
 						<c:forEach var="reflectDTOList" items="${sessionMap.reflectList}">
 							<c:forEach var="reflectDTO" items="${reflectDTOList.value}">
 								<h4>
-									${reflectDTO.fullName}
+									<c:out value="${reflectDTO.fullName}" escapeHtml="true" />
 								</h4>
 								<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
 							</c:forEach>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -314,10 +314,10 @@
 		<%--ImageGallery information-----------------------------------%>
 
 		<h1>
-			${imageGallery.title}
+			<c:out value="${imageGallery.title}" escapeXml="true"/>
 		</h1>
 		<p>
-			${imageGallery.instructions}
+			<c:out value="${imageGallery.instructions}" escapeXml="false"/>
 		</p>
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
 				<div class="info">
@@ -407,9 +407,11 @@
 							<li>
 						</c:otherwise>
 					</c:choose>
-				
-						<a href="<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false" title="${image.title}" id="${image.uid}" width="${image.mediumImageWidth}" height="${image.mediumImageHeight}">
-							<img src="<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false" alt="${image.title}" id="${image.uid}">
+					<c:set var="title">
+						<c:out value="${image.title}" escapeXml="true"/>	
+				        </c:set>
+						<a href="<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false" title="${title}" id="${image.uid}" width="${image.mediumImageWidth}" height="${image.mediumImageHeight}">
+							<img src="<html:rewrite page='/download/?uuid='/>${image.thumbnailFileUuid}&preferDownload=false" alt="${title}" id="${image.uid}">
 						</a>
 					</li>
 				</c:forEach>
@@ -443,7 +445,7 @@
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
-					${sessionMap.reflectInstructions}
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 				</h2>
 
 				<c:choose>
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -29,13 +29,13 @@
 
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}" escapeXml="true"/>
 			</h1>
 
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
-				<lams:out value="${sessionMap.reflectInstructions}" />
+				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -rf0c2b8f197da1cd58d9df772e6f0ef072d656602 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision f0c2b8f197da1cd58d9df772e6f0ef072d656602)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -10,7 +10,7 @@
 	<c:set var="commentsAddedBy" >
 		<fmt:message key="label.learning.added.by" /> 
 		<br>
-			${commentsImage.createBy.loginName}
+			<c:out value="${commentsImage.createBy.loginName}" escapeXml="true"/>
 		<br>
 	</c:set>
 </c:if>
Index: lams_tool_images/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${imageGallery.title}" escapeXml="false" />
+			<c:out value="${imageGallery.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -39,7 +39,10 @@
 				<c:set var="mediumImagePath">
 			   		<html:rewrite page='/download/?uuid='/>${image.mediumFileUuid}&preferDownload=false
 				</c:set>	
-				<img src="${mediumImagePath}" alt="${image.title}" title="${image.title}"/>
+				<c:set var="title">
+					<c:out value="${image.title}" escapeXml="true"/>
+				</c:set>
+				<img src="${mediumImagePath}" alt="${title}" title="${title}"/>
 					
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.resource.title.input" />
@@ -109,7 +112,7 @@
 					
 						<tr>
 							<td>
-								${userImageContribution.user.loginName}
+								<c:out value="${userImageContribution.user.loginName}" escapeXml="true"/>
 							</td>
 							
 							<c:if test="${imageGallery.allowVote}">								
Index: lams_tool_images/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -13,18 +13,18 @@
 				<h1>
 					<fmt:message key="page.title.monitoring.view.reflection"/>
 				</h1>
-				${userDTO.fullName}<BR><BR>
+				<c:out value="${userDTO.fullName}" escapeXml="true"/><BR><BR>
 				<table class="alternative-color" cellspacing="0">
 					<tr>
 						<th class="first">
-							<lams:out value="${userDTO.reflectInstrctions}"/>
+							<lams:out value="${userDTO.reflectInstrctions}" escapeHtml="true"/>
 						</th>
 					</tr>
 					<tr>
 						<td>
 							<c:choose>
 								<c:when test="${userDTO.finishReflection}">
-									<lams:out value="${userDTO.reflect}"/>
+									<lams:out value="${userDTO.reflect}" escapeHtml="true"/>
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="message.no.reflection.available" />
Index: lams_tool_images/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r61d4059adb8c5e6551b4be868e5a0d265d2eacf6 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 61d4059adb8c5e6551b4be868e5a0d265d2eacf6)
+++ lams_tool_images/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -57,11 +57,11 @@
 			<c:if test="${summary.itemUid != -1}">
 				<tr>
 					<td>
-						${summary.itemTitle}
+						<c:out value="${summary.itemTitle}" escapeXml="true"/>
 					</td>
 					<td>
 						<c:if test="${!summary.itemCreateByAuthor}">
-							${summary.username}
+							<c:out value="${summary.username}" escapeXml="true"/>
 						</c:if>
 					</td>
 					<c:choose>
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r99e285ee1203e9036b58bf84cfce0a37a0386406 -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 99e285ee1203e9036b58bf84cfce0a37a0386406)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -33,142 +33,6 @@
 </h1>
 <br />
 
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-	<table class="alternative-color">
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.lock.on.finished" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.lockWhenFinished == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.share.images" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowShareImages == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.notify.monitoring.teachers" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.notifyTeachersOnImageSumbit == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.comment.images" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowCommentImages == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.vote" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowVote == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.rank" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowRank == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="monitor.summary.td.addNotebook" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<c:choose>
-			<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
-				<tr>
-					<td>
-						<fmt:message key="monitor.summary.td.notebookInstructions" />
-					</td>
-					<td>
-						${sessionMap.imageGallery.reflectInstructions}	
-					</td>
-				</tr>
-			</c:when>
-		</c:choose>
-	</table>
-</div>
-
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
@@ -236,19 +100,22 @@
 							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&resizeIframe=true&TB_iframe=true&height=640&width=740
 						</c:set>				
 						<a href="${url}" class="thickbox" title="<fmt:message key='label.monitoring.imagesummary.image.summary' />" style="border-style: none;"> 
-							<img src="${thumbnailPath}" alt="${image.title}" style="border-style: none;"/>
+						<c:set var="title">
+							<c:out value="${image.title}" escapeXml="true"/>
+						</c:set>
+							<img src="${thumbnailPath}" alt="${title}" style="border-style: none;"/>
 						</a>
 					</td>
 					
 					<td style="vertical-align:middle;">
 						<c:set var="title">
-							${image.title}
+							<c:out value="${image.title}" escapeXml="true"/>
 							<c:if test="${!summary.itemCreateByAuthor}">
-								[ <fmt:message key="label.monitoring.by"/> ${summary.username}]
+								[ <fmt:message key="label.monitoring.by"/> <c:out value="${summary.username}]" escapeXml="true"/>
 							</c:if>						
 						</c:set>
 						<a href="${url}" class="thickbox">
-							${title}
+							<c:out value="${title}" escapeXml="false"/>
 						</a>
 					</td>
 					<c:choose>
@@ -293,9 +160,6 @@
 					<fmt:message key="monitoring.user.fullname"/>
 				</th>
 				<th>
-					<fmt:message key="monitoring.label.user.loginname"/>
-				</th>
-				<th>
 					<fmt:message key="monitoring.user.reflection"/>
 				</th>
 			</tr>		
@@ -304,12 +168,9 @@
 			<c:forEach var="user" items="${userList}" varStatus="refStatus">
 				<tr>
 					<td>
-						${user.fullName}
+						<c:out value="${user.fullName}" escapeXml="true"/>
 					</td>
 					<td>
-						${user.loginName}
-					</td>
-					<td>
 						<c:set var="viewReflection">
 							<c:url value="/monitoring/viewReflection.do?toolSessionID=${sessionId}&userUid=${user.userUid}"/>
 						</c:set>
@@ -329,3 +190,139 @@
 		<fmt:message key="label.monitoring.summary.add.new.image" />
 	</a>
 </div>
+
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+	<table class="alternative-color">
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.lock.on.finished" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.lockWhenFinished == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.share.images" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowShareImages == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.notify.monitoring.teachers" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.notifyTeachersOnImageSumbit == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.comment.images" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowCommentImages == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.vote" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowVote == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.rank" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowRank == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="monitor.summary.td.addNotebook" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<c:choose>
+			<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
+				<tr>
+					<td>
+						<fmt:message key="monitor.summary.td.notebookInstructions" />
+					</td>
+					<td>
+						<lams:out value="${sessionMap.imageGallery.reflectInstructions}" escapeHtml="true"/>
+					</td>
+				</tr>
+			</c:when>
+		</c:choose>
+	</table>
+</div>
Index: lams_tool_images/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r4ee829e747865834b56a708e884c3ad3bd1d0492
--- lams_tool_images/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
@@ -19,9 +19,6 @@
 	<table border="0" cellspacing="3" width="98%">
 		<tr>
 			<th>
-				<fmt:message key="monitoring.label.user.loginname" />
-			</th>
-			<th>
 				<fmt:message key="monitoring.label.access.time" />
 			</th>
 			<th>
@@ -31,13 +28,10 @@
 		<c:forEach var="user" items="${userList}">
 			<tr>
 				<td>
-					${user.loginName}
-				</td>
-				<td>
 					<lams:Date value="${user.accessDate}"/>
 				</td>
 				<td>
-					${user.firstName},${user.lastName}
+					<c:out values="${user.firstName},${user.lastName}" escapeXml="true"/>
 				</td>
 			</tr>
 		</c:forEach>