Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
===================================================================
diff -u -r9091ed8c9bae9a48f88622c0c5031af2a39772dc -rd40c2f2f11ceb1086c32f47220853b58541a7100
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision 9091ed8c9bae9a48f88622c0c5031af2a39772dc)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision d40c2f2f11ceb1086c32f47220853b58541a7100)
@@ -352,7 +352,9 @@
 	    Organisation organisation = monitoringService.getOrganisation(organisationID);
 
 	    List<User> staffList = new LinkedList<>();
-	    staffList.add(user);
+	    Vector<User> staffVector = userManagementService.getUsersFromOrganisationByRole(organisationID,
+		    Role.MONITOR, true);
+	    staffList.addAll(staffVector);
 
 	    // add organisation's learners as lesson participants
 	    List<User> learnerList = new LinkedList<>();
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
===================================================================
diff -u -reb459d1edd7a91f2bb5b1baf83bcaca05e4b4ea2 -rd40c2f2f11ceb1086c32f47220853b58541a7100
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision eb459d1edd7a91f2bb5b1baf83bcaca05e4b4ea2)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision d40c2f2f11ceb1086c32f47220853b58541a7100)
@@ -285,12 +285,8 @@
 	    userJSON.put("lastName", user.getLastName());
 	    userJSON.put("login", user.getLogin());
 
-	    if (userDTO.getUserID().equals(user.getUserId())) {
-		// creator is always selected
-		users.withArray("selectedMonitors").add(userJSON);
-	    } else {
-		users.withArray("unselectedMonitors").add(userJSON);
-	    }
+	    // all monitors are added by default
+	    users.withArray("selectedMonitors").add(userJSON);
 	}
 	req.setAttribute("users", users.toString());