diff --git a/package.json b/package.json
index fd1a9a099..4b56cc7ea 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "brace": "^0.11.1",
     "classnames": "^2.2.3",
     "coffeescript": "^1.12.7",
-    "draft-js": "^0.10.1",
+    "draft-js": "0.10.5",
     "draft-js-drag-n-drop-plugin": "^2.0.0-rc2",
     "draft-js-image-plugin": "^2.0.0-rc2",
     "draft-js-mention-plugin": "^2.0.0-rc2",
diff --git a/src/projects/actions/project.js b/src/projects/actions/project.js
index ffa43fe4d..10291c3be 100644
--- a/src/projects/actions/project.js
+++ b/src/projects/actions/project.js
@@ -343,8 +343,8 @@ export function updatePhase(projectId, phaseId, updatedProps, phaseIndex) {
     const phaseActivated = phaseStatusChanged && updatedProps.status === PHASE_STATUS_ACTIVE
     if (phaseActivated) {
       const duration = updatedProps.duration ? updatedProps.duration : phase.duration
-      updatedProps.startDate = moment().utc().hours(0).minutes(0).seconds(0).milliseconds(0).toISOString()
-      updatedProps.endDate = moment(updatedProps.startDate).add(duration - 1, 'days').toISOString()
+      updatedProps.startDate = moment().utc().hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DD')
+      updatedProps.endDate = moment(updatedProps.startDate).add(duration - 1, 'days').format('YYYY-MM-DD')
     }
 
     return dispatch({
@@ -388,7 +388,7 @@ export function updatePhase(projectId, phaseId, updatedProps, phaseIndex) {
             timeline.id,
             {
               name: timeline.name,
-              startDate: updatedProps.startDate.format('YYYY-MM-DD'),
+              startDate: updatedProps.startDate,
               reference: timeline.reference,
               referenceId: timeline.referenceId,
             }