Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff -rccae5ec14269c8b244a2d0af05bc0050483fbfeb
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb)
@@ -529,4 +529,9 @@
 msg.delete.organisation.delete.lessons.confirm =The course or one of its subcourses still contains lessons. They need to be permanently deleted first. You will be redirected to a page where you can do it.
 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.generate =Generate new password
+admin.org.password.change.email =Email new password
+admin.org.password.change.force =Force change password after login
 #======= End labels: Exported 511 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
===================================================================
diff -u -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff -rccae5ec14269c8b244a2d0af05bc0050483fbfeb
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(.../OrgPasswordChangeAction.java)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(.../OrgPasswordChangeAction.java)	(revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb)
@@ -32,6 +32,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -45,6 +46,8 @@
 	Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	DynaActionForm passForm = (DynaActionForm) form;
 	passForm.set(AttributeNames.PARAM_ORGANISATION_ID, organisationID);
+	passForm.set("staffPass", RandomPasswordGenerator.nextPasswordValidated());
+	passForm.set("learnerPass", RandomPasswordGenerator.nextPasswordValidated());
 	return mapping.findForward("start");
     }
 }
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff -rccae5ec14269c8b244a2d0af05bc0050483fbfeb
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb)
@@ -162,12 +162,14 @@
 
 <form-bean name="OrgPasswordChangeForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="organisationID" type="java.lang.Integer" />
+	<form-property name="isStaffChange" type="java.lang.Boolean" initial="1" />
+	<form-property name="isLearnerChange" type="java.lang.Boolean" initial="1" />
 	<form-property name="learners" type="java.lang.String" />
 	<form-property name="staff" type="java.lang.String" />
 	<form-property name="learnerPass" type="java.lang.String" />
 	<form-property name="staffPass" type="java.lang.String" />
 	<form-property name="email" type="java.lang.Boolean" initial="0" />
-	<form-property name="prompt" type="java.lang.Boolean" initial="0" />
+	<form-property name="force" type="java.lang.Boolean" initial="0" />
 </form-bean>
   </form-beans>
 
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff -rccae5ec14269c8b244a2d0af05bc0050483fbfeb
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb)
@@ -1 +1,194 @@
+<%@ 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>
+<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
+<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
+
+<lams:css />
+<style type="text/css">
+	.changeContainer .checkbox {
+		display: inline-block;
+	}
+	.changeContainer .pass {
+		display: inline-block;
+		margin-left: 20px;
+		width: 200px;
+	}
+	.changeContainer .fa {
+		cursor: pointer;
+	}
+</style>
+<%-- javascript --%>
+<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>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript">
+     var mustHaveUppercase = ${mustHaveUppercase},
+	     mustHaveNumerics  = ${mustHaveNumerics},
+	     mustHaveLowercase  = ${mustHaveLowercase},
+	     mustHaveSymbols   = ${mustHaveSymbols};
+
+     $.validator.addMethod("pwcheck", function(value) {
+	      return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters 
+			     (!mustHaveNumerics || /\d/.test(value)) && // has a digit
+			     (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case
+			     (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols
+     });
+	 $.validator.addMethod("charactersAllowed", function(value) {
+		  return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/
+			     .test(value)
+	 });
+
+	$(function() {
+		$('#isStaffChange, #isLearnerChange').change(function(){
+			$(this).closest('.changeContainer').find('.pass').prop('disabled', !$(this).prop('checked'));
+		});
+		
+		
+		
+		// Setup form validation 
+		$("#OrgPasswordChangeForm").validate({
+			debug : true,
+			errorClass : 'help-block',
+			//  validation rules
+			rules : {
+				learnerPassword : {
+					required: false,
+					minlength : <c:out value="${minNumChars}"/>,
+					maxlength : 25,
+					charactersAllowed : true,
+					pwcheck : true
+				},
+				staffPassword: {
+					required: false,
+					minlength : <c:out value="${minNumChars}"/>,
+					maxlength : 25,
+					charactersAllowed : true,
+					pwcheck : true
+				}
+				
+			},
+
+			// Specify the validation error messages
+			messages : {
+				learnerPassword : {
+					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'/>",
+					charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
+					pwcheck : "<fmt:message key='label.password.restrictions'/>"
+				},
+				staffPassword: {
+					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'/>",
+					charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
+					pwcheck : "<fmt:message key='label.password.restrictions'/>"
+				}
+				
+			},
+
+			submitHandler : function(form) {
+				form.submit();
+			}
+		});
+
+	});
+</script>
+
+<p>
+	<a href="<lams:LAMSURL/>admin/usermanage.do?org=<bean:write name='OrgPasswordChangeForm' property='organisationID' />" class="btn btn-default">
+	<fmt:message key="admin.user.manage" /></a>
+</p>
+
+<form id="OrgPasswordChangeForm" action="orgPasswordChange.do" method="post">
+	<div class="panel panel-default panel-body">
+		<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.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="${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>
+		
+		<div class="changeContainer form-group">
+			<table>
+				<tr class="changeContainer">
+					<td class="checkbox">
+						<label>
+							<input id="isStaffChange" name="isStaffChange" value="true" type="checkbox" checked="checked"/>
+							<fmt:message key="admin.org.password.change.is.staff" />
+						</label>
+					</td>
+					<td>
+						<input type="text" id="staffPass" name="staffPass" class="pass form-control" maxlength="25"
+							   value="<bean:write name='OrgPasswordChangeForm' property='staffPass' />" />
+						<i class="fa fa-refresh" title="<fmt:message key='admin.org.password.change.generate' />"></i>
+					</td>
+				</tr>
+				<tr class="changeContainer">
+					<td class="checkbox">
+						<label>
+							<input id="isLearnerChange" name="isLearnerChange" value="true" type="checkbox" checked="checked"/>
+							<fmt:message key="admin.org.password.change.is.learners" />
+						</label>
+					</td>
+					<td>
+						<input type="text" id="learnerPass" name="learnerPass" class="pass form-control" maxlength="25"
+							   value="<bean:write name='OrgPasswordChangeForm' property='learnerPass' />" />
+						<i class="fa fa-refresh" title="<fmt:message key='admin.org.password.change.generate' />"></i>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div class="form-group">
+			<div class="checkbox">
+				<label>
+					<input name="email" value="true" type="checkbox"/><fmt:message key="admin.org.password.change.email" />
+				</label>
+			</div>
+			<div class="checkbox">
+				<label>
+					<input name="force" value="true" type="checkbox"/><fmt:message key="admin.org.password.change.force" />
+				</label>
+			</div>
+		</div>
+	</div>
+</form>
\ No newline at end of file
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r5fa265642903b837423bc95259ba3cef309cdf12 -rccae5ec14269c8b244a2d0af05bc0050483fbfeb
Binary files differ