diff --git a/ccm-core/src/com/arsdigita/bebop/form/Date.java b/ccm-core/src/com/arsdigita/bebop/form/Date.java
index abea49267..d54b33920 100755
--- a/ccm-core/src/com/arsdigita/bebop/form/Date.java
+++ b/ccm-core/src/com/arsdigita/bebop/form/Date.java
@@ -31,8 +31,7 @@ import com.arsdigita.bebop.parameters.ParameterData;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.FormData;
-import com.arsdigita.bebop.parameters.IncompleteDateParameter;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.*;
 // This interface contains the XML element name of this class
 // in a constant which is used when generating XML
 import com.arsdigita.bebop.util.BebopConstants;
@@ -169,7 +168,7 @@ public class Date extends Widget implements BebopConstants {
     public Date(ParameterModel model) {
         super(model);
 
-        if (!(model instanceof DateParameter)) {
+        if (!(model instanceof DateParameter || model instanceof DateTimeParameter)) {
             throw new IllegalArgumentException(
                     "The Date widget " + model.getName()
                     + " must be backed by a DateParameter parmeter model");
diff --git a/ccm-core/src/com/arsdigita/bebop/form/Time.java b/ccm-core/src/com/arsdigita/bebop/form/Time.java
index 00898aa9a..4494d8c69 100755
--- a/ccm-core/src/com/arsdigita/bebop/form/Time.java
+++ b/ccm-core/src/com/arsdigita/bebop/form/Time.java
@@ -21,11 +21,7 @@ package com.arsdigita.bebop.form;
 import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
-import com.arsdigita.bebop.parameters.TimeParameter;
-import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
-import com.arsdigita.bebop.parameters.ParameterData;
-import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.bebop.parameters.*;
 import com.arsdigita.bebop.util.BebopConstants;
 import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.util.Assert;
@@ -186,7 +182,7 @@ public class Time extends Widget implements BebopConstants {
     public Time(ParameterModel model, boolean showSeconds) {
         super(model);
 
-        if (!(model instanceof TimeParameter)) {
+        if (!(model instanceof TimeParameter || model instanceof DateTimeParameter)) {
             throw new IllegalArgumentException(
                     "The Time widget " + model.getName()
                     + " must be backed by a TimeParameter parameter model");