Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
===================================================================
diff -u -r646ad3f8f14c7577e5a1e863f31dacca0c38e860 -r98de145a554d7e654e65f11c8e04d9c8c8d98b20
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision 98de145a554d7e654e65f11c8e04d9c8c8d98b20)
@@ -51,7 +51,7 @@
 	    + " AS u WHERE u.userId =? AND u.session.sessionId=?";
 
     private static final String FIND_BY_SESSION_ID = "FROM " + PeerreviewUser.class.getName()
-	    + " AS u WHERE u.session.sessionId=? AND u.hidden=0";
+	    + " AS u WHERE u.session.sessionId=? AND u.hidden=0 ORDER BY u.firstName, u.lastName";
 
     private static final String GET_COUNT_USERS_FOR_SESSION_EXCLUDE_USER = "SELECT COUNT(*) FROM "
 	    + PeerreviewUser.class.getName() + " AS u WHERE u.session.sessionId=? AND u.userId!=? AND u.hidden=0";
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java
===================================================================
diff -u -r80ad821d3f7342ba66f8ca1140c142cdf88a307a -r98de145a554d7e654e65f11c8e04d9c8c8d98b20
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java	(.../SpreadsheetBuilder.java)	(revision 80ad821d3f7342ba66f8ca1140c142cdf88a307a)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java	(.../SpreadsheetBuilder.java)	(revision 98de145a554d7e654e65f11c8e04d9c8c8d98b20)
@@ -4,6 +4,7 @@
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -187,7 +188,8 @@
 	    criteriaMarkCount[i] = 0;
 	}
 
-	Map<Long, PeerreviewUser> userMap = users.stream().collect(Collectors.toMap(PeerreviewUser::getUserId, u -> u));
+	Map<Long, PeerreviewUser> userMap = users.stream()
+		.collect(Collectors.toMap(PeerreviewUser::getUserId, u -> u, (u1, u2) -> u1, LinkedHashMap::new));
 	Map<Long, ExcelRow> userRowMap = new HashMap<>();
 	// Process all the criterias and build up rows for each rated user. Store in temporary map.
 	List<ItemRatingDTO> ratingDtos = service.getRatingCriteriaDtos(session.getPeerreview().getContentId(),