diff --git a/src/main/java/org/olat/course/nodes/video/_content/edit.html b/src/main/java/org/olat/course/nodes/video/_content/edit.html
index 94297ce07a987e6fd966d1fb0570f40f906bf312..7be3f08e8545b5ee08ebc66d101e7a933b944386 100644
--- a/src/main/java/org/olat/course/nodes/video/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/video/_content/edit.html
@@ -1,6 +1,5 @@
 <fieldset class="o_form form-horizontal clearfix">
-	<legend>
-	$r.translate("header")</legend>
+	<legend>$r.translate("header") $r.contextHelpWithWrapper("Learning resource: Video#_video_courseelement")</legend>
 
 	#if ($showPreviewButton)
 		<div class="form-group">
diff --git a/src/main/java/org/olat/modules/video/ui/VideoQualityTableFormController.java b/src/main/java/org/olat/modules/video/ui/VideoQualityTableFormController.java
index 63251f55d1f3bd77ec15f3dd80b8bcd7b1a5e88d..fd895e258f05a92d7a943ac857a533de18be3d94 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoQualityTableFormController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoQualityTableFormController.java
@@ -76,7 +76,7 @@ public class VideoQualityTableFormController extends FormBasicController {
 		FormLayoutContainer generalCont = FormLayoutContainer.createVerticalFormLayout("general", getTranslator());
 		generalCont.setFormTitle(translate("tab.video.qualityConfig"));
 		generalCont.setRootForm(mainForm);
-		generalCont.setFormContextHelp("Video Tracks");
+		generalCont.setFormContextHelp("Learning resource: Video#_video_resolution");
 		formLayout.add(generalCont);
 
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
diff --git a/src/main/java/org/olat/modules/video/ui/VideoTrackEditController.java b/src/main/java/org/olat/modules/video/ui/VideoTrackEditController.java
index e296b249518ecfd681a71cabfbe75580fd231b3d..b5f59345900ab123f9d29d880f8fb0b619536099 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoTrackEditController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoTrackEditController.java
@@ -80,7 +80,7 @@ public class VideoTrackEditController extends FormBasicController {
 		FormLayoutContainer generalCont = FormLayoutContainer.createVerticalFormLayout("general", getTranslator());
 		generalCont.setFormTitle(translate("tab.video.trackConfig"));
 		generalCont.setRootForm(mainForm);
-		generalCont.setFormContextHelp("Video Tracks");
+		generalCont.setFormContextHelp("Learning resource: Video#_video_subtitle");
 		formLayout.add(generalCont);
 
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
diff --git a/src/main/java/org/olat/resource/accesscontrol/manager/ACMethodDAO.java b/src/main/java/org/olat/resource/accesscontrol/manager/ACMethodDAO.java
index e58a5a3422310ab924c56cb37b40b5725380a3ca..cb33dfb6b83ee3552486ff1cde6e568035c923fc 100644
--- a/src/main/java/org/olat/resource/accesscontrol/manager/ACMethodDAO.java
+++ b/src/main/java/org/olat/resource/accesscontrol/manager/ACMethodDAO.java
@@ -333,7 +333,10 @@ public class ACMethodDAO implements GenericEventListener {
 				.createQuery(sb.toString(), AccessMethod.class)
 				.getResultList();
 		if(methods.isEmpty() && enable) {
-			dbInstance.saveObject(new TokenAccessMethod());
+			TokenAccessMethod method = new TokenAccessMethod();
+			method.setCreationDate(new Date());
+			method.setLastModified(method.getCreationDate());
+			dbInstance.saveObject(method);
 		} else {
 			for(AccessMethod method:methods) {
 				if(method.isEnabled() != enable) {
@@ -352,7 +355,10 @@ public class ACMethodDAO implements GenericEventListener {
 		TypedQuery<AccessMethod> query = dbInstance.getCurrentEntityManager().createQuery(sb.toString(), AccessMethod.class);
 		List<AccessMethod> methods = query.getResultList();
 		if(methods.isEmpty() && enable) {
-			dbInstance.saveObject(new FreeAccessMethod());
+			FreeAccessMethod method = new FreeAccessMethod();
+			method.setCreationDate(new Date());
+			method.setLastModified(method.getCreationDate());
+			dbInstance.saveObject(method);
 		} else {
 			for(AccessMethod method:methods) {
 				if(method.isEnabled() != enable) {
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/paypal/manager/PaypalManagerImpl.java b/src/main/java/org/olat/resource/accesscontrol/provider/paypal/manager/PaypalManagerImpl.java
index 1798334db5a30cbcaf0068a9a22b99fefbe15693..663aec3510f0b09901d81b13976beeb2d730ce32 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/paypal/manager/PaypalManagerImpl.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/paypal/manager/PaypalManagerImpl.java
@@ -205,6 +205,8 @@ public class PaypalManagerImpl extends BasicManager implements PaypalManager {
 			smethod = methods.get(0);
 		} else {
 			smethod = new PaypalAccessMethod();
+			smethod.setCreationDate(new Date());
+			smethod.setLastModified(smethod.getCreationDate());
 			save(smethod);
 		}
 		for(PaypalAccessMethod method:methods) {
diff --git a/src/main/resources/database/mysql/alter_10_5_4_to_10_5_5.sql b/src/main/resources/database/mysql/alter_10_5_4_to_10_5_5.sql
index 324312127e739a27a999395b592649a01a7aabbb..7b13efc620f05ecf381b9127f257210dcdb234c1 100644
--- a/src/main/resources/database/mysql/alter_10_5_4_to_10_5_5.sql
+++ b/src/main/resources/database/mysql/alter_10_5_4_to_10_5_5.sql
@@ -1 +1,4 @@
-alter table o_gta_task modify g_taskname varchar(1024);
\ No newline at end of file
+alter table o_gta_task modify g_taskname varchar(1024);
+
+update o_ac_method set creationdate=now() where creationdate is null;
+update o_ac_method set lastmodified=creationdate where lastmodified is null;
\ No newline at end of file
diff --git a/src/main/resources/database/oracle/alter_10_5_4_to_10_5_5.sql b/src/main/resources/database/oracle/alter_10_5_4_to_10_5_5.sql
index e5e0a5521d6b5f5c76ecd7a5e6c0e28be8c211b5..9d89b1d2e083dc9ab07afad3b749efc8838ca88b 100644
--- a/src/main/resources/database/oracle/alter_10_5_4_to_10_5_5.sql
+++ b/src/main/resources/database/oracle/alter_10_5_4_to_10_5_5.sql
@@ -1 +1,4 @@
 alter table o_gta_task modify g_taskname varchar2(1024 char);
+
+update o_ac_method set creationdate=systimestamp where creationdate is null;
+update o_ac_method set lastmodified=creationdate where lastmodified is null;
\ No newline at end of file
diff --git a/src/main/resources/database/postgresql/alter_10_5_4_to_10_5_5.sql b/src/main/resources/database/postgresql/alter_10_5_4_to_10_5_5.sql
index 17de2b6016ea930eb919c96ffe66a49cdbea9962..f2f695c31dc7ba5687b36b5c7d89e87b305b56bd 100644
--- a/src/main/resources/database/postgresql/alter_10_5_4_to_10_5_5.sql
+++ b/src/main/resources/database/postgresql/alter_10_5_4_to_10_5_5.sql
@@ -1,2 +1,4 @@
 alter table o_gta_task alter column g_taskname type varchar(1024);
 
+update o_ac_method set creationdate=now() where creationdate is null;
+update o_ac_method set lastmodified=creationdate where lastmodified is null;
\ No newline at end of file