Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserListDTO.java
===================================================================
diff -u -r94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31 -r40ca9cd6981fa53a10a9cb60820027dbaafaff2b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserListDTO.java	(.../UserListDTO.java)	(revision 94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserListDTO.java	(.../UserListDTO.java)	(revision 40ca9cd6981fa53a10a9cb60820027dbaafaff2b)
@@ -27,14 +27,8 @@
 import java.util.List;
 
 /**
- * @version
+ * @author Jun-Dir Liew
  *
- * <p>
- * <a href="UserListDTO.java.html"><i>View Source</i></a>
- * </p>
- *
- * @author <a href="mailto:jliew@melcoe.mq.edu.au">Jun-Dir Liew</a>
- *
  * Created at 13:47:02 on 9/06/2006
  */
 public class UserListDTO {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
===================================================================
diff -u -r94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31 -r40ca9cd6981fa53a10a9cb60820027dbaafaff2b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 40ca9cd6981fa53a10a9cb60820027dbaafaff2b)
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.util.ArrayList;
-//import java.util.Iterator;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -39,27 +38,17 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-//import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.Organisation;
-//import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.User;
-//import org.lamsfoundation.lams.usermanagement.UserOrganisation;
-//import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.HttpSessionManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * @version
+ * @author Jun-Dir Liew
  *
- * <p>
- * <a href="UserManageAction.java.html"><i>View Source</i></a>
- * </p>
- *
- * @author <a href="mailto:jliew@melcoe.mq.edu.au">Jun-Dir Liew</a>
- *
  * Created at 13:51:51 on 9/06/2006
  */
 
@@ -74,9 +63,12 @@
  */
 public class UserManageAction extends Action {
 	
-	private static final Logger log = Logger.getLogger(OrgManageAction.class);
-	private static WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager.getInstance().getServletContext());
-	private static IUserManagementService service = (IUserManagementService)ctx.getBean("userManagementServiceTarget");
+	private static final Logger log = Logger.getLogger(UserManageAction.class);
+	private static WebApplicationContext ctx = WebApplicationContextUtils
+	    .getWebApplicationContext(HttpSessionManager.getInstance()
+	    		.getServletContext());
+	private static IUserManagementService service = (IUserManagementService)ctx
+	    .getBean("userManagementServiceTarget");
 	
 	public ActionForward execute(ActionMapping mapping,
             ActionForm form,
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageBean.java
===================================================================
diff -u -r94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31 -r40ca9cd6981fa53a10a9cb60820027dbaafaff2b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageBean.java	(.../UserManageBean.java)	(revision 94ba0a2ccd0f09fa8b1f54ccac63b7e4b70c2c31)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageBean.java	(.../UserManageBean.java)	(revision 40ca9cd6981fa53a10a9cb60820027dbaafaff2b)
@@ -25,14 +25,8 @@
 package org.lamsfoundation.lams.admin.web;
 
 /**
- * @version
+ * @author Jun-Dir Liew
  *
- * <p>
- * <a href="UserManageBean.java.html"><i>View Source</i></a>
- * </p>
- *
- * @author <a href="mailto:jliew@melcoe.mq.edu.au">Jun-Dir Liew</a>
- *
  * Created at 13:34:33 on 9/06/2006
  */
 public class UserManageBean {
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>