Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r624882ebb560d68c3b30d4fb062fdddb01f7cf74
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(.../OrgPasswordChangeController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(.../OrgPasswordChangeController.java)	(revision 624882ebb560d68c3b30d4fb062fdddb01f7cf74)
@@ -190,8 +190,8 @@
 	Boolean email = orgPasswordChangeForm.isEmail();
 	Boolean force = orgPasswordChangeForm.isForce();
 
-	Boolean isStaffChange = orgPasswordChangeForm.getIsStaffChange();
-	Boolean isLearnerChange = orgPasswordChangeForm.getIsLearnerChange();
+	Boolean isStaffChange = orgPasswordChangeForm.getStaffChange();
+	Boolean isLearnerChange = orgPasswordChangeForm.getLearnerChange();
 	// get data needed for each group
 	if (isStaffChange) {
 	    String staffString = orgPasswordChangeForm.getExcludedStaff();
@@ -251,23 +251,27 @@
 	    if (includedUsers == null) {
 		boolean excluded = false;
 		// skip excluded (unchecked on the page) users
-		for (int index = 0; index < excludedUsers.size(); index++) {
-		    Integer excludedUserID = excludedUsers.get(index).asInt();
-		    if (user.getUserId().equals(excludedUserID)) {
-			excluded = true;
-			break;
+		if (excludedUsers != null) {
+		    for (int index = 0; index < excludedUsers.size(); index++) {
+			Integer excludedUserID = excludedUsers.get(index).asInt();
+			if (user.getUserId().equals(excludedUserID)) {
+			    excluded = true;
+			    break;
+			}
 		    }
 		}
 		if (excluded) {
 		    continue;
 		}
 	    } else {
 		boolean included = false;
-		for (int index = 0; index < includedUsers.size(); index++) {
-		    Integer includedUserID = includedUsers.get(index).asInt();
-		    if (user.getUserId().equals(includedUserID)) {
-			included = true;
-			break;
+		if (includedUsers != null) {
+		    for (int index = 0; index < includedUsers.size(); index++) {
+			Integer includedUserID = includedUsers.get(index).asInt();
+			if (user.getUserId().equals(includedUserID)) {
+			    included = true;
+			    break;
+			}
 		    }
 		}
 		if (!included) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r624882ebb560d68c3b30d4fb062fdddb01f7cf74
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java	(.../OrgPasswordChangeForm.java)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrgPasswordChangeForm.java	(.../OrgPasswordChangeForm.java)	(revision 624882ebb560d68c3b30d4fb062fdddb01f7cf74)
@@ -28,17 +28,17 @@
 
     private String orgName;
 
-    private boolean isStaffChange = false;
+    private boolean staffChange = false;
 
-    private boolean isLearnerChange = false;
+    private boolean learnerChange = false;
 
-    private String includedLearners; // initial=""/>
+    private String includedLearners = "";
 
-    private String excludedLearners;
+    private String excludedLearners = "[]";
 
-    private String includedStaff; // initial=""/>
+    private String includedStaff = "";
 
-    private String excludedStaff; // initial="[]"/>
+    private String excludedStaff = "[]";
 
     private String learnerPass;
 
@@ -64,20 +64,20 @@
 	this.orgName = orgName;
     }
 
-    public boolean getIsStaffChange() {
-	return isStaffChange;
+    public boolean getStaffChange() {
+	return staffChange;
     }
 
-    public void setStaffChange(boolean isStaffChange) {
-	this.isStaffChange = isStaffChange;
+    public void setStaffChange(boolean staffChange) {
+	this.staffChange = staffChange;
     }
 
-    public boolean getIsLearnerChange() {
-	return isLearnerChange;
+    public boolean getLearnerChange() {
+	return learnerChange;
     }
 
-    public void setLearnerChange(boolean isLearnerChange) {
-	this.isLearnerChange = isLearnerChange;
+    public void setLearnerChange(boolean learnerChange) {
+	this.learnerChange = learnerChange;
     }
 
     public String getIncludedLearners() {
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -rfe970610ee6b8ad8d2509c3f9a84b3bfd57b895d -r624882ebb560d68c3b30d4fb062fdddb01f7cf74
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision fe970610ee6b8ad8d2509c3f9a84b3bfd57b895d)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 624882ebb560d68c3b30d4fb062fdddb01f7cf74)
@@ -95,8 +95,8 @@
 	
 		$(function() {
 			// assign grid ID to each checkbox and define what happens when it gets (un)checked
-			var changeCheckboxes = $('#isStaffChange').data('grid', 'staffGrid')
-								  .add($('#isLearnerChange').data('grid', 'learnerGrid'))
+			var changeCheckboxes = $('#staffChange').data('grid', 'staffGrid')
+								  .add($('#learnerChange').data('grid', 'learnerGrid'))
 								  .change(function(){
 									  		var checkbox = $(this);
 											// prevent both checkboxes from being unchecked
@@ -416,7 +416,7 @@
 									<td class="changeContainer">
 										<div class="checkbox">
 											<label>
-												<form:checkbox path="isStaffChange" id="isStaffChange" />
+												<form:checkbox path="staffChange" id="staffChange" />
 													<fmt:message key="admin.org.password.change.is.staff" />
 											</label>
 										</div>
@@ -427,7 +427,7 @@
 									<td class="changeContainer">
 										<div class="checkbox">
 											<label>
-												<form:checkbox path="isLearnerChange" id="isLearnerChange" />
+												<form:checkbox path="learnerChange" id="learnerChange" />
 													<fmt:message key="admin.org.password.change.is.learner" />
 											</label>
 										</div>