diff --git a/imports/client/views/core/DatePicker.js b/imports/client/views/core/DatePicker.js
new file mode 100644
index 0000000..f9afcab
--- /dev/null
+++ b/imports/client/views/core/DatePicker.js
@@ -0,0 +1,34 @@
+import React, { Component, PropTypes } from 'react'
+import $ from 'jquery'
+import 'jquery-ui/ui/widgets/datepicker'
+
+class DatePicker extends Component {
+  componentDidMount() {
+    $('.datepicker').datepicker({
+      changeMonth: true,
+      changeYear: true,
+      showButtonPanel: true,
+      yearRange: '-116:+34',
+      dateFormat: 'dd/mm/yy'
+    });
+  }
+
+  render() {
+    return (
+      <input
+        type="text"
+        className="datepicker form-control"
+        placeholder="DD-MM-YYYY"
+        onChange={this.props.onChange}
+        value={this.props.value}
+      />
+    )
+  }
+}
+
+DatePicker.propTypes = {
+  value: PropTypes.string.isRequired,
+  onChange: PropTypes.func.isRequired,
+}
+
+export default DatePicker
diff --git a/imports/client/views/core/validations.js b/imports/client/views/core/validations.js
index 109cd89..8e4bcaf 100644
--- a/imports/client/views/core/validations.js
+++ b/imports/client/views/core/validations.js
@@ -1,5 +1,4 @@
 export const isRequired = (fieldName, value) => {
-  console.log('isRequired', fieldName, value)
   if (!value) {
     return fieldName ? `${fieldName} is required` : 'Required'
   }
diff --git a/imports/client/views/org/admin/students/StudentForm.js b/imports/client/views/org/admin/students/StudentForm.js
index df7b650..3c637de 100644
--- a/imports/client/views/org/admin/students/StudentForm.js
+++ b/imports/client/views/org/admin/students/StudentForm.js
@@ -6,7 +6,8 @@ import {
   FormControl,
   Button
 } from 'react-bootstrap'
-import DatePicker from 'react-bootstrap-date-picker'
+// import DatePicker from 'react-bootstrap-date-picker'
+import DatePicker from '../../../core/DatePicker'
 import Label from '../../../core/Label'
 import Stepper from '../../../core/Stepper'
 import ErrorLabel from '../../../core/ErrorLabel'
@@ -117,9 +118,8 @@ const StudentForm = props => (
               <DatePicker
                 id="dob"
                 value={props.getValue('dob')}
-                onChange={(value, formattedValue) => {
-                  props.setValue('dob', value)
-                  props.setValue('formattedDob', formattedValue)
+                onChange={(e) => {
+                  props.setValue('dob', e.target.value)
                 }}
               />
               {props.isSubmitted() && props.errors && props.errors.dob && (
diff --git a/package.json b/package.json
index 4e2961c..5d7d072 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "csvtojson": "^1.1.4",
     "fs": "0.0.1-security",
     "jquery": "^2.2.4",
+    "jquery-ui": "^1.12.1",
     "jquery-validation": "^1.15.1",
     "lodash": "^4.17.4",
     "material-fabmenu": "0.0.1",