diff --git a/src/main/java/org/olat/admin/user/UserAdminController.java b/src/main/java/org/olat/admin/user/UserAdminController.java
index 9f69ac65d16ab37f3cdce7b03aefb1135b3b06d0..ee534083d039591d5bae81cb91fb906de94e9b0f 100644
--- a/src/main/java/org/olat/admin/user/UserAdminController.java
+++ b/src/main/java/org/olat/admin/user/UserAdminController.java
@@ -498,8 +498,7 @@ public class UserAdminController extends BasicController implements Activateable
 
 	private boolean isPasswordChangesAllowed(Identity identity) {
 		if (managerRoles.isManagerOf(OrganisationRoles.administrator, editedRoles)
-				|| managerRoles.isManagerOf(OrganisationRoles.rolesmanager, editedRoles)
-				|| managerRoles.isManagerOf(OrganisationRoles.usermanager, editedRoles)) {
+				|| managerRoles.isManagerOf(OrganisationRoles.rolesmanager, editedRoles)) {
 			// show pwd form only if user has also right to create new passwords in case
 			// of a user that has no password yet
 			if(ldapLoginModule.isLDAPEnabled() && ldapLoginManager.isIdentityInLDAPSecGroup(identity)) {
diff --git a/src/main/java/org/olat/course/config/CourseConfig.java b/src/main/java/org/olat/course/config/CourseConfig.java
index 4b13a0fe451bef5758d68b7a89054e504a9859fe..9f27fc40fa450ae03c42722a3349b3bac86b03cc 100644
--- a/src/main/java/org/olat/course/config/CourseConfig.java
+++ b/src/main/java/org/olat/course/config/CourseConfig.java
@@ -602,6 +602,7 @@ public class CourseConfig implements Serializable, Cloneable {
 		clone.setCssLayoutRef((String) configuration.get(KEY_CSS_FILEREF));
 		clone.setEfficencyStatementIsEnabled(isEfficencyStatementEnabled());
 		clone.setGlossarySoftKey(getGlossarySoftKey());
+		clone.setGlossaryIsEnabled(isGlossaryEnabled());
 		clone.setSharedFolderSoftkey(getSharedFolderSoftkey());
 		clone.setSharedFolderReadOnlyMount(isSharedFolderReadOnlyMount());
 		clone.setAutomaticCertificationEnabled(isAutomaticCertificationEnabled());
diff --git a/src/main/java/org/olat/course/nodes/CheckListCourseNode.java b/src/main/java/org/olat/course/nodes/CheckListCourseNode.java
index 4005f02eea99b86813623b78a6de541aa52e2220..b5a46dd5b3ab9a85972a1a26709b7bf74c7db73d 100644
--- a/src/main/java/org/olat/course/nodes/CheckListCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/CheckListCourseNode.java
@@ -329,7 +329,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode implements
 
 	@Override
 	public boolean hasCommentConfigured() {
-		return true;
+		return getModuleConfiguration().getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_COMMENT_FIELD, false);
 	}
 	
 	@Override