Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java
===================================================================
diff -u -ra941eded2cb9a388fe1952eb1f5688d5cae694c7 -ra8aca70caaf4061a12aede0a2f7a9c608e7766e9
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(.../OrgPasswordChangeAction.java)	(revision a941eded2cb9a388fe1952eb1f5688d5cae694c7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java	(.../OrgPasswordChangeAction.java)	(revision a8aca70caaf4061a12aede0a2f7a9c608e7766e9)
@@ -23,6 +23,8 @@
 
 package org.lamsfoundation.lams.admin.web.action;
 
+import java.io.IOException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -44,7 +46,7 @@
     private static Logger log = Logger.getLogger(OrgPasswordChangeAction.class);
 
     @Override
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	DynaActionForm passForm = (DynaActionForm) form;
@@ -58,4 +60,11 @@
 
 	return mapping.findForward("start");
     }
+
+    public ActionForward generatePassword(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException {
+	response.setContentType("text/plain;charset=utf-8");
+	response.getWriter().print(RandomPasswordGenerator.nextPasswordValidated());
+	return null;
+    }
 }
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -ra941eded2cb9a388fe1952eb1f5688d5cae694c7 -ra8aca70caaf4061a12aede0a2f7a9c608e7766e9
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a941eded2cb9a388fe1952eb1f5688d5cae694c7)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a8aca70caaf4061a12aede0a2f7a9c608e7766e9)
@@ -971,6 +971,7 @@
       path="/orgPasswordChange"
       type="org.lamsfoundation.lams.admin.web.action.OrgPasswordChangeAction"
       name="OrgPasswordChangeForm"
+      parameter="method"
     >
       <forward
         name="start"
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -ra941eded2cb9a388fe1952eb1f5688d5cae694c7 -ra8aca70caaf4061a12aede0a2f7a9c608e7766e9
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision a941eded2cb9a388fe1952eb1f5688d5cae694c7)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision a8aca70caaf4061a12aede0a2f7a9c608e7766e9)
@@ -52,6 +52,21 @@
 		$('#isStaffChange, #isLearnerChange').change(function(){
 			$(this).closest('.changeContainer').find('.pass').prop('disabled', !$(this).prop('checked'));
 		});
+
+		$('.generatePassword').click(function(){
+			var container = $(this).closest('.changeContainer');
+			if (!container.find('input[type="checkbox"]').prop('checked')) {
+				return;
+			}
+			$.ajax({
+				'url' : 'orgPasswordChange.do',
+				'data': {
+					'method' : 'generatePassword'
+				}
+			}).done(function(password){
+				container.find('.pass').val(password);
+			});
+		});
 		
 		
 		
@@ -164,7 +179,7 @@
 					<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>
+						<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
 					</td>
 				</tr>
 				<tr class="changeContainer">
@@ -177,7 +192,7 @@
 					<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>
+						<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
 					</td>
 				</tr>
 			</table>