Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r1ae8efc0a44c969acdf3311f34085998edbf9152 -ra7b0a98ccdef7a9308b07052506a7d3d8ecfa307
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 1ae8efc0a44c969acdf3311f34085998edbf9152)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision a7b0a98ccdef7a9308b07052506a7d3d8ecfa307)
@@ -8,20 +8,30 @@
 
 <form>
 <h2 align="left">
-  <logic:notEmpty name="pOrgId">
-    <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a> ::
-  </logic:notEmpty>
-  <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserManageForm" property="orgId" />">
-    <bean:write name="UserManageForm" property="orgName"/></a> ::
-  <fmt:message key="admin.user.manage" />
+	<a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+	<logic:equal name="orgType" value="1">
+		: <fmt:message key="admin.user.manage" />
+	</logic:equal>
+	<logic:equal name="orgType" value="2">
+		: <a href="orgmanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+	</logic:equal>
+	<logic:equal name="orgType" value="3">
+		: <a href="orgmanage.do?org=<bean:write name="pOrgId" />"><bean:write name="pOrgName"/></a>
+		: <a href="usermanage.do?org=<bean:write name="UserManageForm" property="orgId" />"><bean:write name="UserManageForm" property="orgName"/></a>
+	</logic:equal>
+	: <fmt:message key="admin.user.manage" />
 </h2>
+
+<p>&nbsp;</p>
+
 <p align="right">
 	<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
 		<input type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	</logic:equal>
 	<logic:notEqual name="UserManageForm" property="orgId" value="1">
 		<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 	</logic:notEqual>
+	<input type="button" value='<fmt:message key="admin.edit" /> <bean:write name="UserManageForm" property="orgName"/>' onclick=javascript:document.location='organisation.do?method=edit&orgId=<c:out value="${UserManageForm.orgId}"/>' />
 </p>
 <table class="alternative-color" width=100%>
 <tr>