Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2fbf5cd0355af8ea46cf304ba448431486c79b77 -r1e56f3aea99f6dd9c95b548e73d4696a992c25d7
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2fbf5cd0355af8ea46cf304ba448431486c79b77)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1e56f3aea99f6dd9c95b548e73d4696a992c25d7)
@@ -530,7 +530,7 @@
 admin.org.password.change.title =Reset password for course members
 admin.org.password.change.button =Password reset
 admin.org.password.change.is.staff =Authors/monitors
-admin.org.password.change.is.learners =Students
+admin.org.password.change.is.learner =Students
 admin.org.password.change.generate =Generate new password
 admin.org.password.change.email =Email new password
 admin.org.password.change.force =Force change password after login
@@ -540,5 +540,8 @@
 admin.org.password.change.grid.email =Email
 admin.org.password.change.grid.error.load =Error while loading users into grid
 admin.org.password.change.choose =Change password for
-
+admin.org.password.change.submit =Change password
+admin.org.password.change.error.prefix.staff =Authors/monitors password 
+admin.org.password.change.error.prefix.learners =Authors/monitors password 
+admin.org.password.change.success =Passwords successfully changed 
 #======= End labels: Exported 511 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
===================================================================
diff -u -ra031d818f691be81b838500d20f61a17f257e7f9 -r1e56f3aea99f6dd9c95b548e73d4696a992c25d7
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(.../OrgPasswordChangeAction.java)	(revision a031d818f691be81b838500d20f61a17f257e7f9)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(.../OrgPasswordChangeAction.java)	(revision 1e56f3aea99f6dd9c95b548e73d4696a992c25d7)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.admin.web.action;
 
 import java.io.IOException;
+import java.security.InvalidParameterException;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -44,8 +45,10 @@
 import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.ValidationUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -67,7 +70,7 @@
 	passForm.set("staffPass", RandomPasswordGenerator.nextPasswordValidated());
 	passForm.set("learnerPass", RandomPasswordGenerator.nextPasswordValidated());
 
-	return mapping.findForward("start");
+	return mapping.findForward("display");
     }
 
     public ActionForward generatePassword(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -141,8 +144,46 @@
 	return null;
     }
 
+    public ActionForward changePassword(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, JSONException {
+	UserDTO userDTO = getUserDTO();
+	Integer currentUserId = userDTO.getUserID();
+	if (!AdminServiceProxy.getSecurityService(getServlet().getServletContext()).isSysadmin(currentUserId,
+		"org password change", false)) {
+	    String warning = "User " + currentUserId + " is not a sysadmin";
+	    log.warn(warning);
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, warning);
+	    return null;
+	}
+
+	DynaActionForm passForm = (DynaActionForm) form;
+	Integer organisationID = (Integer) passForm.get(AttributeNames.PARAM_ORGANISATION_ID);
+	Boolean email = (Boolean) passForm.get("email");
+	Boolean force = (Boolean) passForm.get("force");
+
+	Boolean isStaffChange = (Boolean) passForm.get("isStaffChange");
+	Boolean isLearnerChange = (Boolean) passForm.get("isLearnerChange");
+	if (isStaffChange) {
+	    JSONArray excludedStaff = new JSONArray((String) passForm.get("excludedStaff"));
+	    String staffPass = (String) passForm.get("staffPass");
+	}
+	if (isLearnerChange) {
+	    JSONArray excludedLearners = new JSONArray((String) passForm.get("excludedLearners"));
+	    String learnerPass = (String) passForm.get("learnerPass");
+	}
+
+	request.setAttribute("success", true);
+	return mapping.findForward("display");
+    }
+
+    private void changePassword(String password, List<User> users, boolean force, boolean email) {
+	if (!ValidationUtil.isPasswordValueValid(password, password)) {
+	    throw new InvalidParameterException("Password does not pass validation");
+	}
+    }
+
     private UserDTO getUserDTO() {
 	HttpSession ss = SessionManager.getSession();
 	return (UserDTO) ss.getAttribute(AttributeNames.USER);
     }
-}
+}
\ No newline at end of file
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r0e955e705ea94a190c4ebaff89c8498ee795d612 -r1e56f3aea99f6dd9c95b548e73d4696a992c25d7
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 0e955e705ea94a190c4ebaff89c8498ee795d612)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1e56f3aea99f6dd9c95b548e73d4696a992c25d7)
@@ -974,7 +974,7 @@
       parameter="method"
     >
       <forward
-        name="start"
+        name="display"
         path=".orgPasswordChange"
         redirect="false"
       />
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -r2fbf5cd0355af8ea46cf304ba448431486c79b77 -r1e56f3aea99f6dd9c95b548e73d4696a992c25d7
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 2fbf5cd0355af8ea46cf304ba448431486c79b77)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 1e56f3aea99f6dd9c95b548e73d4696a992c25d7)
@@ -1,8 +1,7 @@
 <%@ include file="/taglibs.jsp"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
+
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<%@ page import="org.apache.struts.action.ActionMessages"%>
 <c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
 <c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
@@ -51,6 +50,11 @@
 	.ui-jqgrid-btable tr.success > td {
 		background-color: transparent !important;
 	}
+	
+	#formValidationErrors {
+		display: none;
+		text-align: center;		
+	}
 </style>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
@@ -120,18 +124,17 @@
 		
 		// Setup form validation 
 		$("#OrgPasswordChangeForm").validate({
-			debug : true,
-			errorClass : 'help-block',
-			//  validation rules
+			errorLabelContainer : '#formValidationErrors',
+			errorClass : 'errorMessage',
 			rules : {
-				learnerPassword : {
+				learnerPass : {
 					required: false,
 					minlength : <c:out value="${minNumChars}"/>,
 					maxlength : 25,
 					charactersAllowed : true,
 					pwcheck : true
 				},
-				staffPassword: {
+				staffPass: {
 					required: false,
 					minlength : <c:out value="${minNumChars}"/>,
 					maxlength : 25,
@@ -143,24 +146,26 @@
 
 			// Specify the validation error messages
 			messages : {
-				learnerPassword : {
+				learnerPass : {
 					required : "<fmt:message key='error.password.empty'/>",
-					minlength : "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-					maxlength : "<fmt:message key='label.password.max.length'/>",
+					minlength : "<fmt:message key='admin.org.password.change.error.prefix.learner'/> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
+					maxlength : "<fmt:message key='admin.org.password.change.error.prefix.learner'/> <fmt:message key='label.password.max.length'/>",
 					charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
 					pwcheck : "<fmt:message key='label.password.restrictions'/>"
 				},
-				staffPassword: {
+				staffPass: {
 					required : "<fmt:message key='error.password.empty'/>",
-					minlength : "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-					maxlength : "<fmt:message key='label.password.max.length'/>",
+					minlength : "<fmt:message key='admin.org.password.change.error.prefix.staff'/> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
+					maxlength : "<fmt:message key='admin.org.password.change.error.prefix.staff'/> <fmt:message key='label.password.max.length'/>",
 					charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
 					pwcheck : "<fmt:message key='label.password.restrictions'/>"
 				}
 				
 			},
 
 			submitHandler : function(form) {
+				$('#excludedLearners').val(JSON.stringify(excludedLearners));
+				$('#excludedStaff').val(JSON.stringify(excludedStaff));
 				form.submit();
 			}
 		});
@@ -188,9 +193,9 @@
 				],
 			    colModel : [
 			        {
-						   'name'  : 'name', 
-						   'index' : 'firstName',
-						   'title' : false
+					   'name'  : 'name', 
+					   'index' : 'firstName',
+					   'title' : false
 					},
 					{
 					   'name'  : 'login', 
@@ -251,48 +256,45 @@
 	<fmt:message key="admin.user.manage" /></a>
 </p>
 
-<form id="OrgPasswordChangeForm" action="orgPasswordChange.do" method="post">
-	<div class="panel panel-default panel-body">
-		<h3><bean:write name='OrgPasswordChangeForm' property='orgName' /></h3>
-		<lams:Alert type="info" id="passwordConditions" close="false">
-			<fmt:message key='label.password.must.contain' />:
-			<ul class="list-unstyled" style="line-height: 1.2">
+<div class="panel panel-default panel-body">
+	<h3><bean:write name='OrgPasswordChangeForm' property='orgName' /></h3>
+	
+	<lams:Alert type="info" id="passwordConditions" close="false">
+		<fmt:message key='label.password.must.contain' />:
+		<ul class="list-unstyled" style="line-height: 1.2">
+			<li><span class="fa fa-check"></span> <fmt:message
+					key='label.password.min.length'>
+					<fmt:param value='${minNumChars}' />
+				</fmt:message></li>
+
+			<c:if test="${mustHaveUppercase}">
 				<li><span class="fa fa-check"></span> <fmt:message
-						key='label.password.min.length'>
-						<fmt:param value='${minNumChars}' />
-					</fmt:message></li>
+						key='label.password.must.ucase' /></li>
+			</c:if>
+			<c:if test="${mustHaveLowercase}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.lcase' /></li>
+			</c:if>
 
-				<c:if test="${mustHaveUppercase}">
-					<li><span class="fa fa-check"></span> <fmt:message
-							key='label.password.must.ucase' /></li>
-				</c:if>
-				<c:if test="${mustHaveLowercase}">
-					<li><span class="fa fa-check"></span> <fmt:message
-							key='label.password.must.lcase' /></li>
-				</c:if>
+			<c:if test="${mustHaveNumerics}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.number' /></li>
+			</c:if>
 
-				<c:if test="${mustHaveNumerics}">
-					<li><span class="fa fa-check"></span> <fmt:message
-							key='label.password.must.number' /></li>
-				</c:if>
 
-
-				<c:if test="${mustHaveSymbols}">
-					<li><span class="fa fa-check"></span> <fmt:message
-							key='label.password.must.symbol' /></li>
-				</c:if>
-			</ul>
-			
-		</lams:Alert>
-		<logic:messagesPresent>
-			<lams:Alert type="danger" id="form-error" close="false">
-				<html:messages id="error">
-					<c:out value="${error}" escapeXml="false" />
-					<br />
-				</html:messages>
-			</lams:Alert>
-		</logic:messagesPresent>
+			<c:if test="${mustHaveSymbols}">
+				<li><span class="fa fa-check"></span> <fmt:message
+						key='label.password.must.symbol' /></li>
+			</c:if>
+		</ul>
 		
+	</lams:Alert>
+	
+	<form id="OrgPasswordChangeForm" action="orgPasswordChange.do" method="post">
+		<input type="hidden" name="method" value="changePassword" />
+		<input type="hidden" id="excludedLearners" name="excludedLearners" value="[]" />
+		<input type="hidden" id="excludedStaff" name="excludedStaff" value="[]" />
+		
 		<div class="form-group">
 			<div class="checkbox">
 				<label>
@@ -305,6 +307,16 @@
 				</label>
 			</div>
 		</div>
+		
+		<c:if test="${success}">
+			<lams:Alert type="info" id="passwordConditions" close="false">
+				<h4><fmt:message key="admin.org.password.change.success" /></h4>
+			</lams:Alert>
+		</c:if>
+		
+		<div id="formValidationErrors">
+			<ul></ul>
+		</div>
 		<h4><fmt:message key="admin.org.password.change.choose" /></h4>
 		<table id="changeTable">
 			<tbody>
@@ -326,7 +338,7 @@
 						<div class="checkbox">
 							<label>
 								<input id="isLearnerChange" name="isLearnerChange" value="true" type="checkbox" checked="checked"/>
-								<fmt:message key="admin.org.password.change.is.learners" />
+								<fmt:message key="admin.org.password.change.is.learner" />
 							</label>
 						</div>
 						<input type="text" id="learnerPass" name="learnerPass" class="pass form-control" maxlength="25"
@@ -346,5 +358,8 @@
 				</tr>
 			</tbody>
 		</table>
-	</div>
-</form>
\ No newline at end of file
+		<div class="pull-right voffset20">
+			<input type="submit" class="btn btn-primary" value="<fmt:message key='admin.org.password.change.submit' />" />
+		</div>
+	</form>
+</div>
\ No newline at end of file
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -ra031d818f691be81b838500d20f61a17f257e7f9 -r1e56f3aea99f6dd9c95b548e73d4696a992c25d7
Binary files differ