Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
===================================================================
diff -u -r7dac65b89adddab2b602b5d57d8e3ddd4cab2060 -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision 7dac65b89adddab2b602b5d57d8e3ddd4cab2060)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java	(.../Summary.java)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -87,7 +87,8 @@
 	    this.itemCreateByAuthor = item.isCreateByAuthor();
 	    this.itemHide = item.isHide();
 	    this.itemTitle = item.getTitle();
-	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
+	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getFirstName() + " "
+		    + item.getCreateBy().getLastName();
 	    this.fileName = item.getFileName();
 	    this.fileUuid = item.getOriginalFileUuid();
 	    this.fileVersionId = item.getFileVersionId();
@@ -114,7 +115,8 @@
 	    this.itemCreateByAuthor = item.isCreateByAuthor();
 	    this.itemHide = item.isHide();
 	    this.itemTitle = item.getTitle();
-	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName();
+	    this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getFirstName() + " "
+		    + item.getCreateBy().getLastName();
 	    this.fileName = item.getFileName();
 	    this.fileUuid = item.getOriginalFileUuid();
 	    this.fileVersionId = item.getFileVersionId();
Index: lams_tool_images/web/pages/export/exportimagelearner.jsp
===================================================================
diff -u -r4ee829e747865834b56a708e884c3ad3bd1d0492 -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/web/pages/export/exportimagelearner.jsp	(.../exportimagelearner.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
+++ lams_tool_images/web/pages/export/exportimagelearner.jsp	(.../exportimagelearner.jsp)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -18,7 +18,8 @@
 				<c:if test="${!image.createByAuthor && image.createBy != null}">
 					<td style="align:left;">	
 						<h2>
-							<fmt:message key="label.export.uploaded.by" />: <c:out value="${image.createBy.loginName}"></c:out>
+							<fmt:message key="label.export.uploaded.by" />:
+							<c:out value="${image.createBy.firstName} ${image.createBy.lastName}" escapeXml="true"/>
 						</h2>
 					</td>
 				</c:if>
@@ -68,7 +69,7 @@
 					<tr >
 						<th >
 							<fmt:message key="label.learning.by" />
-							<c:set var="author" value="${comment.createBy.loginName}" />
+							<c:set var="author" value="${comment.createBy.firstName} ${comment.createBy.lastName}" />
 							<c:out value="${author}" escapeXml="true"/>
 									-				
 							<lams:Date value="${comment.createDate}" />
Index: lams_tool_images/web/pages/export/exportimageteacher.jsp
===================================================================
diff -u -r4b47f86b588e38c9e7e9f2760c75f775cb080831 -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/web/pages/export/exportimageteacher.jsp	(.../exportimageteacher.jsp)	(revision 4b47f86b588e38c9e7e9f2760c75f775cb080831)
+++ lams_tool_images/web/pages/export/exportimageteacher.jsp	(.../exportimageteacher.jsp)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -23,7 +23,8 @@
 				<c:if test="${!image.createByAuthor && image.createBy != null}">
 					<td style="align:left;">	
 						<h2>
-							<fmt:message key="label.export.uploaded.by" />: <c:out value="${image.createBy.loginName}"></c:out>
+							<fmt:message key="label.export.uploaded.by" />:
+							<c:out value="${image.createBy.firstName} ${image.createBy.lastName}" escapeXml="true"/>
 						</h2>
 					</td>
 				</c:if>
@@ -94,7 +95,7 @@
 							
 				<tr>
 					<td>
-						${userContribution.user.loginName}
+						<c:out value="${userContribution.user.firstName} ${userContribution.user.lastName}" escapeXml="true" />
 					</td>
 							
 					<c:if test="${imageGallery.allowVote}">								
Index: lams_tool_images/web/pages/learning/parts/commentlist.jsp
===================================================================
diff -u -r3bc514681593b0694c54d0c77da015388362c196 -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 3bc514681593b0694c54d0c77da015388362c196)
+++ lams_tool_images/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -12,15 +12,13 @@
 				<tr >
 					<th >
 						<fmt:message key="label.learning.by" />
-						<c:set var="author" value="${comment.createBy.loginName}" />
+						<c:set var="author" value="${comment.createBy.firstName} ${comment.createBy.lastName}" />
 						<c:if test="${empty author}">
 							<c:set var="author">
 								<fmt:message key="label.default.user.name" />
 							</c:set>
 						</c:if>
-						${author}
-								-				
-						<lams:Date value="${comment.createDate}" />
+						<c:out value="${author}" escapeXml="true" /> - <lams:Date value="${comment.createDate}" />
 					</th>
 				</tr>
 				
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r4ee829e747865834b56a708e884c3ad3bd1d0492 -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -10,7 +10,7 @@
 	<c:set var="commentsAddedBy" >
 		<fmt:message key="label.learning.added.by" /> 
 		<br>
-			<c:out value="${commentsImage.createBy.loginName}" escapeXml="true"/>
+			<c:out value="${commentsImage.createBy.firstName} ${commentsImage.createBy.lastName}" escapeXml="true"/>
 		<br>
 	</c:set>
 </c:if>
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -r4ee829e747865834b56a708e884c3ad3bd1d0492 -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 4ee829e747865834b56a708e884c3ad3bd1d0492)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -112,7 +112,7 @@
 					
 						<tr>
 							<td>
-								<c:out value="${userImageContribution.user.loginName}" escapeXml="true"/>
+								<c:out value="${userImageContribution.user.firstName} ${userImageContribution.user.lastName}" escapeXml="true"/>
 							</td>
 							
 							<c:if test="${imageGallery.allowVote}">								
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r26654d6d3622f1dd74cf7b311ead1d0bb238b05f -rd5e74a600d6f98a220972baea94c6fd877de1071
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 26654d6d3622f1dd74cf7b311ead1d0bb238b05f)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d5e74a600d6f98a220972baea94c6fd877de1071)
@@ -96,7 +96,7 @@
 						<c:set var="title">
 							<c:out value="${image.title}" escapeXml="true"/>
 							<c:if test="${!summary.itemCreateByAuthor}">
-								[ <fmt:message key="label.monitoring.by"/> <c:out value="${summary.username}]" escapeXml="true"/>
+								[ <fmt:message key="label.monitoring.by"/> <c:out value="${summary.username}" escapeXml="true"/> ]
 							</c:if>						
 						</c:set>
 						<a href="${url}" class="thickbox">