diff --git a/onprc_ehr/resources/queries/study/flags.query.xml b/onprc_ehr/resources/queries/study/flags.query.xml
index e1e38b743..6c129e173 100644
--- a/onprc_ehr/resources/queries/study/flags.query.xml
+++ b/onprc_ehr/resources/queries/study/flags.query.xml
@@ -11,12 +11,12 @@
                     <column columnName="Id"/>
                     <column columnName="date">
                         <columnTitle>Date Added</columnTitle>
-                        <formatString>Date</formatString>
+                        <formatString>DateTime</formatString>
                     </column>
                     <column columnName="enddate">
                         <columnTitle>Date Removed</columnTitle>
                         <isHidden>false</isHidden>
-                        <formatString>Date</formatString>
+                        <formatString>DateTime</formatString>
                     </column>
                     <column columnName="project">
                         <isHidden>true</isHidden>
diff --git a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js
index 6a96e4701..1532b529a 100644
--- a/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js
+++ b/onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js
@@ -483,8 +483,8 @@ exports.init = function(EHR){
     EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.INIT, 'study', 'flags', function(event, helper){
         helper.setScriptOptions({
             allowFutureDates: true,
-            removeTimeFromDate: true,
-            removeTimeFromEndDate: true
+            removeTimeFromDate: false,
+            removeTimeFromEndDate: false
         });
 
         EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'flags', EHR.Server.TriggerManager.Events.AFTER_INSERT);
diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Flag_settings.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Flag_settings.js
new file mode 100644
index 000000000..57d9a9d12
--- /dev/null
+++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Flag_settings.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+EHR.model.DataModelManager.registerMetadata('Flag_Settings', {
+    allQueries: {
+
+    },
+    byQuery: {
+        'study.flags': {
+            date: {
+                xtype: 'xdatetime',
+                extFormat: LABKEY.extDefaultDateTimeFormat,
+                editorConfig: {
+                    dateFormat: LABKEY.extDefaultDateFormat,
+                    timeFormat: 'H:i'
+                }
+
+            },
+            enddate: {
+                xtype: 'xdatetime',
+                extFormat: LABKEY.extDefaultDateTimeFormat,
+                editorConfig: {
+                    dateFormat: LABKEY.extDefaultDateFormat,
+                    timeFormat: 'H:i'
+                }
+
+            }
+
+        }
+    }
+});
\ No newline at end of file
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
index 43c3631c4..362f42144 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
@@ -26,6 +26,7 @@
 import org.labkey.api.security.GroupManager;
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.security.permissions.Permission;
+import org.labkey.api.view.template.ClientDependency;
 import org.labkey.security.xml.GroupEnumType;
 
 import java.util.ArrayList;
@@ -49,6 +50,12 @@ public FlagsFormType(DataEntryFormContext ctx, Module owner)
                 new SimpleGridPanel("study", "flags", "Flags")
         ));
 
+        addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/Flag_settings.js"));
+
+        for  (FormSection s : getFormSections())
+        {
+            s.addConfigSource("Flag_Settings");
+        }
 
     }