Index: lams_central/web/includes/javascript/portrait.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r837bfa5d17a7bde922671274f95b5df5ab1ff63b
--- lams_central/web/includes/javascript/portrait.js	(.../portrait.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/portrait.js	(.../portrait.js)	(revision 837bfa5d17a7bde922671274f95b5df5ab1ff63b)
@@ -23,7 +23,7 @@
 // Add a portrait to an existing div as specified by selector.
 function addPortrait( selector, portraitId, userId, size, round, LAMS_URL ) {
     var isRound = round == null ? true : round;
-    if ( portraitId  && portraitId > 0) {
+    if ( portraitId ) {
     		selector.css('background-image', 'url(' + LAMS_URL + 'download?preferDownload=false&uuid=' + portraitId + _getSizeVersion(size) + ')');
     		selector.addClass(_getSizeCSS(size));
     		if ( isRound ) {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
===================================================================
diff -u -r365a2c22199a5fe2b1e55e18cbf4b6d2596f202b -r837bfa5d17a7bde922671274f95b5df5ab1ff63b
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 365a2c22199a5fe2b1e55e18cbf4b6d2596f202b)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 837bfa5d17a7bde922671274f95b5df5ab1ff63b)
@@ -21,7 +21,8 @@
     public List<UserDTO> getAllUsersPaged(Integer page, Integer size, String sortBy, String sortOrder,
 	    String searchPhrase) {
 	return getAllUsersPage(
-		"SELECT user.userId, user.login, user.firstName, user.lastName, user.email, user.portraitUuid FROM User user WHERE user.disabledFlag=0 ",
+		"SELECT user.userId, user.login, user.firstName, user.lastName, user.email, user.portraitUuid "
+			+ "FROM User user WHERE user.disabledFlag=0 ",
 		"user", page, size, sortBy, sortOrder, searchPhrase);
     }
 
@@ -90,9 +91,9 @@
 	    String firstName = (String) element[2];
 	    String lastName = (String) element[3];
 	    String email = (String) element[4];
-	    byte[] portraitUuid = (byte[]) element[5];
+	    UUID portraitUuid = (UUID) element[5];
 	    UserDTO userDto = new UserDTO(userId, firstName, lastName, login, null, null, null, email, null, null, null,
-		    null, false, null, portraitUuid == null ? null : UUID.nameUUIDFromBytes(portraitUuid).toString());
+		    null, false, null, portraitUuid == null ? null : portraitUuid.toString());
 
 	    userDtos.add(userDto);
 	}