diff --git a/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e b/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e
index 290649d0..cef49ee9 100644
--- a/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e
+++ b/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e
@@ -37,7 +37,7 @@ feature {NONE} -- Initialization
 		do
 			make_multi_control_with_tag_name (t)
 			add_class ("input-group date")
-			create input.make ("10-09-2013")
+			create input.make ((create {DATE_TIME}.make_now).formatted_out ("[0]dd-[0]mm-yyyy"))
 			input.add_class ("form-control")
 			input.append_attribute ("size=%"16%" readonly=%"%"")
 			add_control (input)
diff --git a/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf b/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
index 14a4d6b0..6dea1b7a 100644
--- a/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -14,9 +14,9 @@
 		<library name="http" location="..\..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<library name="pcre" location="$ISE_LIBRARY\unstable\library\text\regexp\pcre\pcre-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf"/>
-		<cluster name="kernel" location=".\kernel\" recursive="true">
-		</cluster>
+		<cluster name="kernel" location=".\kernel\" recursive="true"/>
 	</target>
 </system>