Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31 -r40ca9cd6981fa53a10a9cb60820027dbaafaff2b
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 40ca9cd6981fa53a10a9cb60820027dbaafaff2b)
@@ -6,9 +6,10 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <form>
-<h4 align="left"><fmt:message key="admin.user.manage" /></h4>
-<p align="left"><fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/> : <bean:write name="UserManageForm" property="orgName"/></p>
-<p align="right"><input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='user.do?method=add&orgId=<bean:write name="UserManageForm" property="orgId"/>' /></p>
+<h4 align="left"><fmt:message key="admin.user.manage" /> <fmt:message key="admin.in"/> <fmt:message key="admin.organisation"/>: <a href="orgmanage.do?org=<bean:write name='UserManageForm' property='orgId'/>"><bean:write name="UserManageForm" property="orgName"/></a></h4>
+<p align="right">
+<input type="button" value='<fmt:message key="admin.user.create"/>' onclick=javascript:document.location='user.do?method=edit&orgId=1' />
+<input type="button" value='<fmt:message key="admin.user.add"/>' onclick=javascript:document.location='user.do?method=add&orgId=<bean:write name="UserManageForm" property="orgId"/>' /></p>
 <table width=100%>
 <tr>
 	<th></th>
@@ -36,9 +37,9 @@
 			<bean:write name="userManageBean" property="lastName" />
 		</td>
 		<td>
-				<a href="user.do?method=edit&userId=<bean:write name='userManageBean' property='userId' />"><fmt:message key="admin.edit"/></a>
+				<a href="user.do?method=edit&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.edit"/></a>
 				&nbsp;
-				<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />"><fmt:message key="admin.user.remove"/></a>
+				<a href="user.do?method=remove&userId=<bean:write name='userManageBean' property='userId' />&orgId=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key="admin.user.remove"/></a>
 				<br/>
 		</td>		
 	</tr>