Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddAction.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -re492b26493063bca3a73c31c590f987bf6e89cdc
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddAction.java	(.../UsersAddAction.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddAction.java	(.../UsersAddAction.java)	(revision e492b26493063bca3a73c31c590f987bf6e89cdc)
@@ -171,14 +171,13 @@
 			if ( users != null )
 			{
 				//remove users who already exists in current organisation
-				Iterator iter = users.iterator();
-				while(iter.hasNext()){
-					User user = (User)iter.next();
+				for(int i=0; i<users.size(); i++ ){
+					User user = (User)users.get(i);
 					Iterator iter2 = existingUsers.iterator();
 					while(iter2.hasNext()){
 						User existingUser = (User)iter2.next();
 						if(user.getUserId().equals(existingUser.getUserId())){
-							users.remove(user);
+							users.remove(i);
 						}
 					}
 				}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddActionForm.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -re492b26493063bca3a73c31c590f987bf6e89cdc
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddActionForm.java	(.../UsersAddActionForm.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/web/UsersAddActionForm.java	(.../UsersAddActionForm.java)	(revision e492b26493063bca3a73c31c590f987bf6e89cdc)
@@ -144,6 +144,18 @@
 	}
 
 	/**
+	 * @return Returns the allRoleNames.
+	 */
+	public String[] getAllRoleNames() {
+		return allRoleNames;
+	}
+	/**
+	 * @param allRoleNames The allRoleNames to set.
+	 */
+	public void setAllRoleNames(String[] allRoleNames) {
+		this.allRoleNames = allRoleNames;
+	}
+	/**
 	 * @return Returns the potentialRoleNames.
 	 */
 	public String[] getPotentialRoleNames() {
Index: lams_common/web/admin/usersaddContent.jsp
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -re492b26493063bca3a73c31c590f987bf6e89cdc
--- lams_common/web/admin/usersaddContent.jsp	(.../usersaddContent.jsp)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/web/admin/usersaddContent.jsp	(.../usersaddContent.jsp)	(revision e492b26493063bca3a73c31c590f987bf6e89cdc)
@@ -45,7 +45,7 @@
 		<tr> 
 			<td valign="top">
 				<H2>Add Existing Users To <bean:write name="UsersAddActionForm" property="name"/></H2>
-				<html:hidden name="UsersAddActionForm" property="organisationId"/>
+				<html:hidden name="UsersAddActionForm" property="orgId"/>
 				<html:errors/>							
 				<p class="body"><strong>Select an organisation from which to pick new users: </strong></p>
 				<select name="selectedOrgId" onchange="showName(this)">
@@ -71,7 +71,7 @@
 					<p class="body"><strong>Select Users and Assign Roles </strong></p>
 					<table>
 						<c:set var="me" value="${remoteUser}"/>
-						<logic:iterate id="user" indexId="index" name="UsersAddActionForm" property="potentialUsers" type="User" >
+						<logic:iterate id="user" name="UsersAddActionForm" property="potentialUsers" type="User" >
 							<logic:present name="user">
 								<TR>
 									<TD class="body" valign="top">
@@ -82,9 +82,9 @@
 									<TD class="body" >							  
 										<c:if test="${not ( user.login eq me)}">
 											<c:forEach var="item" items="${UsersAddActionForm.allRoleNames}">
-												<!--<input type="checkbox" name="potentialRoleNames" value="<c:out value="${user.login}">_<c:out value="${item}"/>">-->
+												<input type="checkbox" name="potentialRoleNames" value="<c:out value="${user.login}"/>_<c:out value="${item}"/>">						
 												<c:out value="${item}"/>
-											</c:forEach>	
+			  								</c:forEach>	
 										</c:if>
 									</TD>
 								</TR>