diff --git a/src/main/java/org/olat/course/nodes/_spring/buildingblockContext.xml b/src/main/java/org/olat/course/nodes/_spring/buildingblockContext.xml
index 351778bf7fceae05f221d360be9edcec653ed154..891cd41c2302040cb3acdd2b2b43d7436b856440 100644
--- a/src/main/java/org/olat/course/nodes/_spring/buildingblockContext.xml
+++ b/src/main/java/org/olat/course/nodes/_spring/buildingblockContext.xml
@@ -40,10 +40,12 @@
 	</bean>
 
 	<bean id="cp" class="org.olat.course.nodes.cp.CPCourseNodeConfiguration" scope="prototype" >
+		<property name="enabled" value="${course.node.cp.enabled}" />
 		<property name="order" value="40" />
 	</bean>
 	
 	<bean id="scorm" class="org.olat.course.nodes.scorm.ScormCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.scorm.enabled}" />
 		<property name="order" value="50" />
 	</bean>	
 	
@@ -56,14 +58,17 @@
 	</bean>
 
 	<bean id="podcast" class="org.olat.course.nodes.feed.podcast.PodcastCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.podcast.enabled}" />
 		<property name="order" value="70" />
 	</bean>
 	
 	<bean id="blog" class="org.olat.course.nodes.feed.blog.BlogCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.blog.enabled}" />
 		<property name="order" value="80" />
 	</bean>
 
 	<bean id="dialog" class="org.olat.course.nodes.dialog.DialogCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.dialog.enabled}" />
 		<property name="order" value="100" />
 	</bean>
 	
@@ -95,26 +100,32 @@
 	</bean>
 			
 	<bean id="projectbroker" class="org.olat.course.nodes.projectbroker.ProjectBrokerNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.projectbroker.enabled}" />
 		<property name="order" value="181" />
 	</bean>
 
 	<bean id="iqtest" class="org.olat.course.nodes.iq.IQTESTCourseNodeConfiguration" scope="prototype" depends-on="qtiResultManager">
+		<property name="enabled" value="${course.node.test.enabled}" />
 		<property name="order" value="150" />
 	</bean>
 	
 	<bean id="iqself" class="org.olat.course.nodes.iq.IQSELFCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.selfttest.enabled}" />
 		<property name="order" value="160" />
 	</bean>
 	
 	<bean id="iqsurv" class="org.olat.course.nodes.iq.IQSURVCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.survey.enabled}" />
 		<property name="order" value="170" />
 	</bean>
 	
 	<bean id="en" class="org.olat.course.nodes.en.ENCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.en.enabled}" />
 		<property name="order" value="180" />
 	</bean>
 
 	<bean id="co" class="org.olat.course.nodes.co.COCourseNodeConfiguration" scope="prototype">
+		<property name="enabled" value="${course.node.co.enabled}" />
 		<property name="order" value="190" />
 	</bean>
 	
@@ -128,6 +139,7 @@
 	</bean>
 	
 	<bean id="checklist" class="org.olat.course.nodes.cl.CheckListCourseNodeConfiguration" scope="prototype" >
+		<property name="enabled" value="${course.node.modern.checklist.enabled}" />
 		<property name="order" value="210" />
 	</bean>
 	
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_spring/basicLtiContext.xml b/src/main/java/org/olat/course/nodes/basiclti/_spring/basicLtiContext.xml
index 0258084fd4a577d8e65682d2829e5c7352be271e..c46c6d9709c05dd07da8724af7e715ca7324f4e2 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_spring/basicLtiContext.xml
+++ b/src/main/java/org/olat/course/nodes/basiclti/_spring/basicLtiContext.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
   http://www.springframework.org/schema/beans 
-  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+  http://www.springframework.org/schema/beans/spring-beans.xsd">
   
   <bean id="lti" class="org.olat.course.nodes.basiclti.LTICourseNodeConfiguration" scope="prototype">
 	<property name="enabled" value="${course.node.basiclti.enabled}" />
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 9bf1b5b69cbc5e9e0633a3128b4f92eb2171276c..d185f27f50a9acefdd722fe293fb62e51a24f313 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -1043,12 +1043,34 @@ paypal.data.format.values=XML,JSON,SOAP11
 course.node.linklist.enabled=true
 course.node.checklist.enabled=false
 course.node.dateenrollment.enabled=false
+# The LTI course element
 course.node.basiclti.enabled=true
 course.node.portfolio.enabled=true
 course.node.infomessage.enabled=true
 course.node.members.enabled=true
 course.node.vc.enabled=false
 
+course.node.cp.enabled=true
+course.node.scorm.enabled=true
+course.node.podcast.enabled=true
+course.node.blog.enabled=true
+# The project broker
+course.node.projectbroker.enabled=true
+# The test QTI 1.2
+course.node.test.enabled=true
+# The self test QTI 1.2
+course.node.selfttest.enabled=true
+# The survey QTI 1.2
+course.node.survey.enabled=true
+# The modern check list
+course.node.modern.checklist.enabled=true
+# The file dialog course element
+course.node.dialog.enabled=true
+# The course enrollment
+course.node.en.enabled=true
+# the contact / mail course element
+course.node.co.enabled=true
+
 ########################################
 # Options for e-portfolio
 ########################################