Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r52b2e7c9cebda1dc4f158859c54914e85877bdd5
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 52b2e7c9cebda1dc4f158859c54914e85877bdd5)
@@ -18,6 +18,7 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
 <script type="text/javascript">
   	$(document).ready(function(){
+  	
   		var $table = $(".tablesorter").tablesorter({
   			theme: 'bootstrap',
   			headerTemplate : '{content} {icon}',
@@ -134,7 +135,7 @@
 </p>
 
 <lams:TSTable numColumns="6"> 
-	<th width="3%" clas="{sorter: 'digit'}">
+	<th width="3%">
 		<fmt:message key="admin.user.userid"/>
 	</th>
 	<th width="15%" align="center">
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
===================================================================
diff -u -r3dbf966d900adefc34cdad501d3c392118451cd9 -r52b2e7c9cebda1dc4f158859c54914e85877bdd5
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 52b2e7c9cebda1dc4f158859c54914e85877bdd5)
@@ -19,18 +19,33 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<UserDTO> getAllUsersPaged(int page, int size, String sortBy, String sortOrder, String searchPhrase) {
+	
+	switch (sortBy) {
+	case "userId":
+	    sortBy = "user.userId + 0 ";
+	    break;
+	case "login":
+	    sortBy = "user.login ";
+	    break;
+	case "firstName":
+	    sortBy = "user.firstName ";
+	    break;
+	case "lastName":
+	    sortBy = "user.lastName ";
+	    break;
+	case "email":
+	    sortBy = "user.email ";
+	    break;
+	}
+	
 	StringBuilder queryBuilder = new StringBuilder(
 		"SELECT user.userId, user.login, user.firstName, user.lastName, user.email FROM User user WHERE user.disabledFlag=0 ");
 	// support for custom search from a toolbar
 	UserDAO.addNameSearch(queryBuilder, "user", searchPhrase);
 	//order by
-	queryBuilder
-		.append(" ORDER BY CASE WHEN :sortBy='userId' THEN user.userId WHEN :sortBy='login' THEN user.login WHEN :sortBy='firstName'"
-			+ " THEN user.firstName  WHEN :sortBy='lastName' THEN user.lastName WHEN :sortBy='email' THEN user.email END ")
-		.append(sortOrder);
+	queryBuilder.append(" ORDER BY ").append(sortBy).append(sortOrder);
 
 	Query query = getSession().createQuery(queryBuilder.toString());
-	query.setString("sortBy", sortBy);
 	query.setFirstResult(page * size);
 	query.setMaxResults(size);
 	List<Object[]> list = query.list();