Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r1e56f3aea99f6dd9c95b548e73d4696a992c25d7 -r83743057f72d69e4319966e7afb674712e8be3b0
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1e56f3aea99f6dd9c95b548e73d4696a992c25d7)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 83743057f72d69e4319966e7afb674712e8be3b0)
@@ -163,14 +163,14 @@
 <form-bean name="OrgPasswordChangeForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="organisationID" type="java.lang.Integer" />
 	<form-property name="orgName" type="java.lang.String" />
-	<form-property name="isStaffChange" type="java.lang.Boolean" initial="1" />
-	<form-property name="isLearnerChange" type="java.lang.Boolean" initial="1" />
+	<form-property name="isStaffChange" type="java.lang.Boolean" initial="false" />
+	<form-property name="isLearnerChange" type="java.lang.Boolean" initial="false" />
 	<form-property name="excludedLearners" type="java.lang.String" initial="[]"/>
 	<form-property name="excludedStaff" type="java.lang.String" initial="[]"/>
 	<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="force" type="java.lang.Boolean" initial="0" />
+	<form-property name="email" type="java.lang.Boolean" initial="false" />
+	<form-property name="force" type="java.lang.Boolean" initial="false" />
 </form-bean>
   </form-beans>
 
@@ -972,6 +972,7 @@
       type="org.lamsfoundation.lams.admin.web.action.OrgPasswordChangeAction"
       name="OrgPasswordChangeForm"
       parameter="method"
+      scope="request"
     >
       <forward
         name="display"