Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rf4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0 -r68d706a717523e9fc110ac8ec85a5b319deb8bf3
--- lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision f4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0)
+++ lams_common/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 68d706a717523e9fc110ac8ec85a5b319deb8bf3)
@@ -22,6 +22,11 @@
     <form-bean name="UserActionForm"
                type="com.lamsinternational.lams.usermanagement.web.UserActionForm" />
                
+    <form-bean name="UsersAddActionForm"
+               type="com.lamsinternational.lams.usermanagement.web.UsersAddActionForm" />
+
+    <form-bean name="UsersRemoveActionForm"
+               type="com.lamsinternational.lams.usermanagement.web.UsersRemoveActionForm" />
                
 	</form-beans>
 	<!-- ========== Global Exceptions Definitions =================================== -->
@@ -74,6 +79,9 @@
       <forward name="user"
                path=".admin.user">
       </forward>
+      <forward name="usersadd"
+               path=".admin.usersadd">
+      </forward>
       <forward name="error"
                path=".admin.error">
       </forward>
@@ -102,12 +110,46 @@
       <forward name="admin"
                path=".admin">
       </forward>
+      <forward name="userview"
+               path=".admin.userview">
+      </forward>
       <forward name="error"
                path=".admin.error">
       </forward>
 	</action>
 
+    <action path="/usersadd"
+            type="com.lamsinternational.lams.usermanagement.web.UsersAddAction"
+            name="UsersAddActionForm"
+            scope="session"
+            input=".admin.usersadd"
+            validate="true">
+      <forward name="admin"
+               path=".admin">
+      </forward>
+      <forward name="usersadd"
+               path=".admin.usersadd">
+      </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
+	</action>
 
+    <action path="/usersremove"
+            type="com.lamsinternational.lams.usermanagement.web.UsersRemoveAction"
+            name="UsersRemoveActionForm"
+            scope="session"
+            input=".admin.usersremove"
+            validate="false">
+      <forward name="admin"
+               path=".admin">
+      </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
+	</action>
+
+
     <action path="/passwordChanged"
             type="com.lamsinternational.lams.web.PasswordChangeAction"
             name="PasswordChangeActionForm"
Index: lams_common/web/admin/adminContent.jsp
===================================================================
diff -u -rf4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0 -r68d706a717523e9fc110ac8ec85a5b319deb8bf3
--- lams_common/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision f4d707caa833b4dc2ebbb72dad0d9f7964e1f2a0)
+++ lams_common/web/admin/adminContent.jsp	(.../adminContent.jsp)	(revision 68d706a717523e9fc110ac8ec85a5b319deb8bf3)
@@ -27,7 +27,10 @@
 				error +="\n- Please choose an Excel format file";
 		}
 		if(error == ""){
-			document.forms[1].submit();
+			if(document.forms[0].checkbox.checked){
+				document.forms[0].action = "admin.do?method=importUsersFromFile&orgId=<c:out value="${organisation.organisationId}"/>&existingUsersOnly=true" ;
+			}
+			document.forms[0].submit();
 		}else{
 			alert(error);
 			return false;
@@ -73,7 +76,7 @@
 		}
 		out.println("</TD><TD align=\"center\">");
 		out.println("<input name=\"updateUser\" type=\"button\" class=\"button\" id=\"updateUser\"");
-		out.println("onClick=\"javascript:document.location='admin.do?method=getUserEdit&userid="+user.getUserId()+"&organisationid="+org.getOrganisationId()+"';\"");
+		out.println("onClick=\"javascript:document.location='admin.do?method=getUserEdit&userid="+user.getUserId()+"&orgId="+org.getOrganisationId()+"';\"");
 		out.println("onMouseOver=\"changeStyle(this,'buttonover')\"");
 		out.println("onMouseOut=\"changeStyle(this,'button')\"");
 		out.println("value=\"Update\" />");
@@ -167,19 +170,19 @@
 	
 			<p>
 				<input name="createUser" type="button" class="extendingButton" id="createUser" 
-					onClick="javascript:document.location='admin.do?method=getUserEdit&organisationid=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='admin.do?method=getUserEdit&orgId=<c:out value="${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Create new user" /></input>
 				&nbsp;			
 				<input name="addUsers" type="button" class="extendingButton" id="addUsers" 
-					onClick="javascript:document.location='admin.do?method=getOrganisationAddUsers&organisationid=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='admin.do?method=getUsersAdd&orgId=<c:out value="${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Add existing user" />
 				&nbsp;			
 				<input name="removeUsers" type="button" class="extendingButton" id="removeUsers" 
-					onClick="javascript:document.location='admin.do?method=getOrganisationRemoveUsers&organisationid=<c:out value="${organisation.organisationId}"/>';" 		
+					onClick="javascript:document.location='admin.do?method=getUsersRemove&orgId=<c:out value="${organisation.organisationId}"/>';" 		
 					onMouseOver="changeStyle(this,'extendingButtonover')"
 					onMouseOut="changeStyle(this,'extendingButton')" 
 					value="Remove Users" />