Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc368a79cdaf7adf21f3185b6bdccd024320982c9 -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c368a79cdaf7adf21f3185b6bdccd024320982c9)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -527,4 +527,6 @@
 sysadmin.lesson.delete.title =Delete all lessons from course
 msg.delete.organisation.confirm =You are about to permanently remove a course. Are you sure want to do this?
 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
 #======= End labels: Exported 511 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
===================================================================
diff -u
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(revision 0)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -0,0 +1,50 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.admin.web.action;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+public class OrgPasswordChangeAction extends DispatchAction {
+
+    private static Logger log = Logger.getLogger(OrgPasswordChangeAction.class);
+
+    @Override
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
+	DynaActionForm passForm = (DynaActionForm) form;
+	passForm.set(AttributeNames.PARAM_ORGANISATION_ID, organisationID);
+	return mapping.findForward("start");
+    }
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java	(.../UserManageAction.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserManageAction.java	(.../UserManageAction.java)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.admin.web.action;
 
 import java.util.Collections;
@@ -122,6 +121,7 @@
 	} else {
 	    return forwardError(mapping, request, "error.authorisation");
 	}
+	userManageForm.setCanResetOrgPassword(request.isUserInRole(Role.SYSADMIN));
 
 	userManageForm.setOrgId(orgId);
 	userManageForm.setOrgName(orgName);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java	(.../UserListDTO.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java	(.../UserListDTO.java)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.admin.web.dto;
 
 import java.util.List;
@@ -34,12 +33,12 @@
  *         Created at 13:47:02 on 9/06/2006
  */
 public class UserListDTO {
-
     private List<UserManageBean> userManageBeans;
     private Integer orgId;
     private String orgName;
     private Boolean courseAdminCanAddNewUsers;
     private Boolean courseAdminCanBrowseAllUsers;
+    private Boolean canResetOrgPassword;
 
     public List<UserManageBean> getUserManageBeans() {
 	return userManageBeans;
@@ -80,4 +79,13 @@
     public void setCourseAdminCanBrowseAllUsers(Boolean courseAdminCanBrowseAllUsers) {
 	this.courseAdminCanBrowseAllUsers = courseAdminCanBrowseAllUsers;
     }
-}
+
+    public Boolean getCanResetOrgPassword() {
+	return canResetOrgPassword;
+    }
+
+    public void setCanResetOrgPassword(Boolean canResetOrgPassword) {
+	this.canResetOrgPassword = canResetOrgPassword;
+    }
+
+}
\ No newline at end of file
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r5f626596bbeb5bbbbd800be3ddf6ff7f1bdaeaa6 -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5f626596bbeb5bbbbd800be3ddf6ff7f1bdaeaa6)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -159,6 +159,16 @@
 	<form-property name="loginTabActive" type="java.lang.Boolean" initial="0" />
 	<form-property name="context" type="java.lang.String" />
 </form-bean>
+
+<form-bean name="OrgPasswordChangeForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="organisationID" type="java.lang.Integer" />
+	<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-bean>
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -954,6 +964,17 @@
       path="/uploadPortraits"
       type="org.lamsfoundation.lams.admin.web.action.PortraitBatchUploadAction"
     />
+    <action
+      path="/orgPasswordChange"
+      type="org.lamsfoundation.lams.admin.web.action.OrgPasswordChangeAction"
+      name="OrgPasswordChangeForm"
+    >
+      <forward
+        name="start"
+        path=".orgPasswordChange"
+        redirect="false"
+      />
+    </action>
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
Index: lams_admin/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -r5f626596bbeb5bbbbd800be3ddf6ff7f1bdaeaa6 -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff
--- lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 5f626596bbeb5bbbbd800be3ddf6ff7f1bdaeaa6)
+++ lams_admin/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -244,4 +244,8 @@
 		<put name="content" value="signupmanagement/list.jsp" />
 	</definition>
 	
+	<definition name=".orgPasswordChange" path="/template.jsp">
+		<put name="title" value="admin.org.password.change.title"/>
+		<put name="content" value="orgPasswordChange.jsp" />	
+	</definition>
 </tiles-definitions>
\ No newline at end of file
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u
--- lams_admin/web/orgPasswordChange.jsp	(revision 0)
+++ lams_admin/web/orgPasswordChange.jsp	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -0,0 +1 @@

\ No newline at end of file
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r7dce137f52dd2664abf689e18789fab2a79b4407 -r4b44632629e35a6b8dc8a970bc0ecc27f38d66ff
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 7dce137f52dd2664abf689e18789fab2a79b4407)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 4b44632629e35a6b8dc8a970bc0ecc27f38d66ff)
@@ -65,6 +65,9 @@
 		</span>
 		<div class="pull-right btn-group btn-group-sm">
 			<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+			<logic:equal name="UserManageForm" property="canResetOrgPassword" value="true">
+				<a class="btn btn-default" href="orgPasswordChange.do?organisationID=<bean:write name='UserManageForm' property='orgId'/>"><fmt:message key='admin.org.password.change.button'/></a>
+			</logic:equal>
 			<logic:equal name="UserManageForm" property="courseAdminCanAddNewUsers" value="true">
 				<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit&orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 			</logic:equal>