diff --git a/src/components/Widgets/DateControl.js b/src/components/Widgets/DateControl.js
index 7dfa4277..ff88ca2c 100644
--- a/src/components/Widgets/DateControl.js
+++ b/src/components/Widgets/DateControl.js
@@ -1,28 +1,41 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import DateTime from 'react-datetime';
+import moment from 'moment';
 
-export default class DateControl extends React.Component {
+function format(format, value) {
+  return moment(value).format(format || moment.defaultFormat);
+}
+
+export default class DateTimeControl extends React.Component {
   componentDidMount() {
     if (!this.props.value) {
-      this.props.onChange(new Date());
+      this.props.onChange(format(this.props.field.get('format'), new Date()));
     }
   }
 
   handleChange = (datetime) => {
-    this.props.onChange(datetime);
+    this.props.onChange(format(this.props.field.get('format'), datetime));
   };
 
   render() {
-    return (<DateTime
-      timeFormat={false}
-      value={this.props.value}
-      onChange={this.handleChange}
+    return (
+      <DateTime
+        timeFormat={this.props.includeTime || false}
+        value={moment(this.props.value, this.props.field.get('format'))}
+        onChange={this.handleChange}
     />);
   }
 }
 
-DateControl.propTypes = {
+DateTimeControl.propTypes = {
   onChange: PropTypes.func.isRequired,
-  value: PropTypes.object, // eslint-disable-line
+  value: PropTypes.oneOfType([
+    PropTypes.object,
+    PropTypes.string,
+  ]),
+  includeTime: PropTypes.bool,
+  field: PropTypes.object
 };
+
+
diff --git a/src/components/Widgets/DateTimeControl.js b/src/components/Widgets/DateTimeControl.js
index ed869e65..0bc5f438 100644
--- a/src/components/Widgets/DateTimeControl.js
+++ b/src/components/Widgets/DateTimeControl.js
@@ -1,27 +1,9 @@
-import PropTypes from 'prop-types';
 import React from 'react';
-import DateTime from 'react-datetime';
+import DateControl from './DateControl';
 
 export default class DateTimeControl extends React.Component {
-  componentDidMount() {
-    if (!this.props.value) {
-      this.props.onChange(new Date());
-    }
-  }
-
-  handleChange = (datetime) => {
-    this.props.onChange(datetime);
-  };
-
   render() {
-    return <DateTime value={this.props.value} onChange={this.handleChange} />;
+    const {onChange, format, value, field} = this.props;
+    return <DateControl onChange={onChange} format={format} value={value} field={field} includeTime={true}/>;
   }
-}
-
-DateTimeControl.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  value: PropTypes.oneOfType([
-    PropTypes.object,
-    PropTypes.string,
-  ]),
-};
+};
\ No newline at end of file