Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -ref31c70885b34d2475c8b297d7f9bb0f564a829b -r6dade094470f5df866a43be6245686e225a7c4ef
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision ef31c70885b34d2475c8b297d7f9bb0f564a829b)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 6dade094470f5df866a43be6245686e225a7c4ef)
@@ -36,6 +36,7 @@
 	<form>
 	
 	<div class="floatRight">
+		<input class="button" type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit' />
 		<input class="button" type="button" value='Find Users' onclick=javascript:document.location='usersearch.do' />
 		<logic:equal name="manageGlobalRoles" value="true">
 			<input class="button" type="button" value='<fmt:message key="admin.global.roles.manage" />' onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -r6dade094470f5df866a43be6245686e225a7c4ef
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 6dade094470f5df866a43be6245686e225a7c4ef)
@@ -15,8 +15,7 @@
 		</logic:empty>
 	</logic:notEmpty>
 	<logic:empty name="UserForm" property="orgId">
-		<a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
-		: <a href="usersearch.do"><fmt:message key="admin.user.find" /></a>
+		<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
 	</logic:empty>
 </h4>
 
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r301b444dedf83e9caa28a69f3d70b84942181052 -r6dade094470f5df866a43be6245686e225a7c4ef
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 301b444dedf83e9caa28a69f3d70b84942181052)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 6dade094470f5df866a43be6245686e225a7c4ef)
@@ -12,7 +12,7 @@
 	//-->
 </script>
 
-<h4><a href="sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a> </h4>
+<h4><a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a> </h4>
 <h1><fmt:message key="admin.user.find"/></h1>
 
 <logic:notEqual name="isSysadmin" value="false">
@@ -29,21 +29,11 @@
 <p align="right">
 	<input class="button" type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit' />
 </p>
-<table cellspacing="6">
-	<tr>
-		<td align="right"><fmt:message key="admin.search" />:&nbsp;</td>
-		<td><html:text property="term" size="20" /></td>
-	</tr>
-	<tr>
-		<td align="right"><fmt:message key="label.show.all.users"/>:&nbsp;</td>
-		<td><html:checkbox property="showAll" /></td>
-	</tr>
-	<tr>
-		<td colspan="2" align="center"><html:submit styleClass="button" /></td>
-	</tr>
-</table>
 
-<br/>
+<p align="right">
+	<fmt:message key="admin.search" />:&nbsp;<html:text property="term" size="20" /> 
+	or <a onclick="document.UserSearchForm.term.value='';document.UserSearchForm.submit();"><fmt:message key="label.show.all.users"/></a>
+</p>
 
 <logic:notEmpty name="userList">
 <p><c:out value="${numUsers}" /></p>