Index: lams_central/web/emailuser.jsp
===================================================================
diff -u -rb3c871874679a1d784db0d7dfac2fdabe65baf83 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
+++ lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -109,7 +109,7 @@
 						value="" /> <span><label><fmt:message
 								key="email.to" />:</label> <c:if test="${not empty user}">
 							<lams:Portrait userId="${user.userId}"/> 
-							<c:out value="${user.firstName} ${user.lastName}" /> &lt;<c:out
+							<c:out value="${user.lastName}, ${user.firstName}" /> &lt;<c:out
 								value="${user.email}" />&gt;
 							 </c:if> </span>
 
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -555,7 +555,7 @@
 									'userId'  : userJSON.userID
 									})
 			                    .addClass('draggableItem')
-    						    .text(userJSON.firstName + ' ' + userJSON.lastName 
+    						    .text(userJSON.lastName + ', ' + userJSON.firstName 
     						    		  + ' (' + userJSON.login + ')'
     						    	 )
     		);
Index: lams_central/web/includes/javascript/dialog.js
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -373,7 +373,7 @@
 		"isCreateInParentWindow" : !isTopLevelWindow,		
 		'title' : LABELS.EMAIL_NOTIFICATIONS_TITLE,
 		'open' : function() {
-			var dialog = $(this),
+			var dialog = this,
 				lessonID = dialog.data('lessonID');
 			// if lesson ID is given, use lesson view; otherwise use course view
 			if (lessonID) {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r957baf121a8a77b545ce2fbb752b8f9150dfa1af -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 957baf121a8a77b545ce2fbb752b8f9150dfa1af)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -255,6 +255,10 @@
 	return this.getFirstName() + " " + this.getLastName();
     }
 
+    public String getFullNameMonitoringStyle() {
+	return new StringBuilder(this.getLastName()).append(", ").append(this.getFirstName()).toString();
+    }
+
     public String getAddressLine1() {
 	return addressLine1;
     }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
diff -u -r2ed09b40081fc4dd0ebd267ac45a57d9db3dabd3 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(.../GBUserGridRowDTO.java)	(revision 2ed09b40081fc4dd0ebd267ac45a57d9db3dabd3)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(.../GBUserGridRowDTO.java)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -49,7 +49,7 @@
 
     public GBUserGridRowDTO(User user) {
 	this.id = user.getUserId().toString();
-	this.rowName = StringEscapeUtils.escapeHtml(user.getLastName() + " " + user.getFirstName());
+	this.rowName = StringEscapeUtils.escapeHtml(user.getLastName() + ", " + user.getFirstName());
 	this.firstName = user.getFirstName();
 	this.lastName = user.getLastName();
 	this.login = user.getLogin();
Index: lams_learning/web/notebook/viewalljournals.jsp
===================================================================
diff -u -rb3c871874679a1d784db0d7dfac2fdabe65baf83 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision b3c871874679a1d784db0d7dfac2fdabe65baf83)
+++ lams_learning/web/notebook/viewalljournals.jsp	(.../viewalljournals.jsp)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -41,7 +41,7 @@
 			<!-- set user check flag -->
 			<c:if test="${status.first}">
 				<c:set var="userToCheck" value="${entry.user.userId}" />
-				<h4><lams:Portrait userId="${entry.user.userId}"/><c:out value="${entry.user.fullName}" escapeXml="false" /></h4>
+				<h4><lams:Portrait userId="${entry.user.userId}"/><c:out value="${entry.user.fullNameMonitoringStyle}" escapeXml="false" /></h4>
 				<tr>
 					<th scope="col" width="30%" colspan="2"><fmt:message key="mynotes.entry.title.label" /></th>
 					<th scope="col" width="25%" align="center"><fmt:message key="mynotes.entry.create.date.label" /></th>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -1898,9 +1898,9 @@
 	List<User> recipients = getArchivedEmailNotificationRecipients(emailNotificationUid, null, null);
 	for (User recipient : recipients) {
 	    row = new ExcelCell[1];
-	    row[0] = new ExcelCell(
-		    recipient.getFirstName() + " " + recipient.getLastName() + " [" + recipient.getLogin() + "]",
-		    false);
+	    String recipientName = new StringBuilder(recipient.getLastName()).append(", ")
+		    .append(recipient.getFirstName()).append(" [").append(recipient.getLogin()).append("]").toString();
+	    row[0] = new ExcelCell(recipientName, false);
 	    rows.add(row);
 	}
 
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
===================================================================
diff -u -r78b448706a4b92d425c6d68add1c40d82759a6c7 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -330,7 +330,8 @@
 	    rowJSON.put(GradebookConstants.ELEMENT_ID, recipient.getUserId());
 
 	    JSONArray cellJSON = new JSONArray();
-	    cellJSON.put(recipient.getFirstName() + " " + recipient.getLastName() + " [" + recipient.getLogin() + "]");
+	    cellJSON.put(new StringBuilder(recipient.getLastName()).append(", ").append(recipient.getFirstName())
+		    .append(" [").append(recipient.getLogin()).append("]").toString());
 
 	    rowJSON.put(GradebookConstants.ELEMENT_CELL, cellJSON);
 	    rowsJSON.put(rowJSON);
@@ -598,9 +599,9 @@
 	// data is going into a jquery UI table that doesn't need to it be escaped. LDEV-4514
 	for (User user : users) {
 	    JSONArray cell = new JSONArray();
-	    cell.put(new StringBuilder(user.getFirstName()).append(" ")
-		    .append(user.getLastName()).append(" (")
-		    .append(user.getLogin()) + ")").toString();
+	    cell.put(new StringBuilder(user.getLastName()).append(", ")
+		    .append(user.getFirstName()).append(" (")
+		    .append(user.getLogin()).append(")").toString());
 
 	    JSONObject cellobj = new JSONObject();
 	    cellobj.put("id", "" + user.getUserId());
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -rd815a2118f51e6fef637179ba6a438e563ab1003 -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision d815a2118f51e6fef637179ba6a438e563ab1003)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
@@ -2307,8 +2307,8 @@
  * Formats learner name.
  */
 function getLearnerDisplayName(learner, raw) {
-	return raw ? learner.firstName + ' ' + learner.lastName + ' (' + learner.login + ')'
-			   : escapeHtml(learner.firstName) + ' ' + escapeHtml(learner.lastName) + ' (' + escapeHtml(learner.login) + ')';
+	return raw ? learner.lastName + ', ' + learner.firstName + ' (' + learner.login + ')'
+			   : escapeHtml(learner.lastName) + ', ' + escapeHtml(learner.firstName) + ' (' + escapeHtml(learner.login) + ')';
 }