diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml
index 3a6da339f..4f99c8ed1 100644
--- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml
+++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/assetPicker.xhtml
@@ -1,9 +1,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
       xmlns:cc="http://xmlns.jcp.org/jsf/composite"
-      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-    <cc:interface shortDescription="An component for selecting assets.">
+    <cc:interface shortDescription="An component for selecting assets. Additional components for the form may be added as children of the tag. They are inserted before the form elements for looking up assets.">
         <cc:attribute name="actionUrl"
                       required="true"
                       shortDescription="Base URL for the actions of the asset picker."
@@ -99,6 +100,9 @@
                         <form action="#{cc.attrs.actionUrl}"
                               class="modal-body"
                               method="post">
+                            
+                            <cc:insertChildren />
+                            
                             <input class="assetpicker-param" 
                                    id="#{cc.attrs.assetPickerId}-param-input"
                                    name="#{cc.attrs.formParamName}"
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml
index b6493ce54..2ad40c5b2 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/event/event-basic-properties.xhtml
@@ -174,14 +174,14 @@
                         </div>
                         <div class="modal-footer">
                             <button class="btn btn-warning"
-                                        data-dismiss="modal"
-                                        type="button">
+                                    data-dismiss="modal"
+                                    type="button">
                                     #{CmsEventMessageBundle['basicproperties.eventdatetime.edit.dialog.close']}
-                                </button>
-                                <button class="btn btn-success"
-                                        type="submit">
+                            </button>
+                            <button class="btn btn-success"
+                                    type="submit">
                                     #{CmsEventMessageBundle['basicproperties.eventdatetime.edit.dialog.submit']}
-                                </button>
+                            </button>
                         </div>
                     </form>
                 </div>
