Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -r83813a0305c0aac6ce942d61ce1ce3ccee5361ce -r8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 83813a0305c0aac6ce942d61ce1ce3ccee5361ce)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a)
@@ -25,7 +25,6 @@
 errors.header=<p class="warning">Please correct the following errors before proceeding:
 errors.footer=</p>
 errors.prefix=<br />
-errors.suffix=
 error.system = Oops! An unexpected exception thrown by the system. Contact your System Administrator. 
 error.org.invalid = Invalid Organisation Id. {0}
 error.orgtype.invalid = Invalid operation for this type of organisation.
@@ -125,6 +124,7 @@
 role.SYSADMIN = System Admin
 label.member.of = Member of
 label.with.roles = With roles
+label.show.all.users = Show all users
 
 #==================== Organisation Management Screen ======================#
 admin.organisation.management = Group/Subgroup Management
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r29551b741b1aec1a353848c10813385d7d72c3c8 -r8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a
--- lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 29551b741b1aec1a353848c10813385d7d72c3c8)
+++ lams_admin/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a)
@@ -55,6 +55,7 @@
     <form-property name="sFirstName" type="java.lang.String" />
     <form-property name="sLastName" type="java.lang.String" />
     <form-property name="searched" type="java.lang.Boolean" initial="false" />
+    <form-property name="showAll" type="java.lang.Boolean" initial="false" />
 </form-bean>
 
 <form-bean name="LoginMaintainForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java
===================================================================
diff -u -r622101803252450b96cc9882a17ae20de4f6e431 -r8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java	(.../UserSearchAction.java)	(revision 622101803252450b96cc9882a17ae20de4f6e431)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java	(.../UserSearchAction.java)	(revision 8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a)
@@ -90,26 +90,31 @@
 		String login = ((String)userSearchForm.get("sLogin")).trim();
 		String firstName = ((String)userSearchForm.get("sFirstName")).trim();
 		String lastName = ((String)userSearchForm.get("sLastName")).trim();
+		Boolean showAll = (Boolean)userSearchForm.get("showAll");
 		
 		log.debug("got userId: '"+userId+"'");
 		log.debug("got login: '"+login+"'");
 		log.debug("got firstName: '"+firstName+"'");
 		log.debug("got lastName: '"+lastName+"'");
 		
 		List userList = new ArrayList();
-		if(userId.length()==0) {
-			Map<String, String> stringProperties = new HashMap<String,String>();
-			if(login.length()>0) stringProperties.put("login","%"+login+"%");
-			if(firstName.length()>0) stringProperties.put("firstName","%"+firstName+"%");
-			if(lastName.length()>0) stringProperties.put("lastName","%"+lastName+"%");
-			if(!stringProperties.isEmpty()) userList = service.searchByStringProperties(User.class,stringProperties);
-		}else{
-			Map<String, Object> objectProperties = new HashMap<String,Object>();
-			objectProperties.put("userId",userId);
-			if(login.length()>0) objectProperties.put("login",login);
-			if(firstName.length()>0) objectProperties.put("firstName",firstName);
-			if(lastName.length()>0) objectProperties.put("lastName",lastName);
-			if(!objectProperties.isEmpty()) userList = service.findByProperties(User.class,objectProperties);
+		if (showAll) {
+			userList = service.findAll(User.class);
+		} else {
+			if(userId.length()==0) {
+				Map<String, String> stringProperties = new HashMap<String,String>();
+				if(login.length()>0) stringProperties.put("login","%"+login+"%");
+				if(firstName.length()>0) stringProperties.put("firstName","%"+firstName+"%");
+				if(lastName.length()>0) stringProperties.put("lastName","%"+lastName+"%");
+				if(!stringProperties.isEmpty()) userList = service.searchByStringProperties(User.class,stringProperties);
+			}else{
+				Map<String, Object> objectProperties = new HashMap<String,Object>();
+				objectProperties.put("userId",userId);
+				if(login.length()>0) objectProperties.put("login",login);
+				if(firstName.length()>0) objectProperties.put("firstName",firstName);
+				if(lastName.length()>0) objectProperties.put("lastName",lastName);
+				if(!objectProperties.isEmpty()) userList = service.findByProperties(User.class,objectProperties);
+			}
 		}
 		
 		if(userList.isEmpty() && (Boolean)userSearchForm.get("searched")){
@@ -120,6 +125,7 @@
 		
 		userList = removeDisabledUsers(userList);
 		
+		userSearchForm.set("showAll", false);
 		userSearchForm.set("searched", true);
 		request.setAttribute("userList",userList);
 		return mapping.findForward("usersearchlist");
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -rbaf684f0c64ff2686a9415c68c943ecf4184046d -r8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision baf684f0c64ff2686a9415c68c943ecf4184046d)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 8ffa8e9a03c0d185ac035fa6e014e9cc542ca11a)
@@ -60,6 +60,7 @@
 
 <tr>
 	<td colspan=5 align="right">
+		<html:checkbox property="showAll"><fmt:message key="label.show.all.users"/></html:checkbox>&nbsp;
 		<html-el:submit><fmt:message key="admin.search"/></html-el:submit>
 		<input type="button" value='<fmt:message key="admin.reset"/>' onclick="resetFields();" />
 	</td>