diff --git a/js/main.js b/js/main.js
index e54c09949e407713631a25ab319ac07926d0741a..3daa2d11ff334307387ae992970cbc56f68fade4 100644
--- a/js/main.js
+++ b/js/main.js
@@ -305,7 +305,7 @@ function editMilestone(milestone_ID, roadmap_ID)
 	else
 	{
 		done = 0;
-		doneDate = doneDate = "01.01.2001";
+		doneDate =  "01.01.2001";
 	}
 
 	$.post('../admin/helper/edit-milestone.php',
diff --git a/php/admin/admin-edit-milestone.php b/php/admin/admin-edit-milestone.php
index 532f0c127113e88e687aa25950d488c86c20ef8f..92001d77aeb7660afc86e3cdea36fd3fe103a30f 100644
--- a/php/admin/admin-edit-milestone.php
+++ b/php/admin/admin-edit-milestone.php
@@ -133,7 +133,22 @@ else
 					<div class="col s6 m8 offset-m2 l6 offset-l3">
 						<div class="col s12 left-align">
 							<label for="due-date" style="font-size: 1rem;">Due Date</label>
-							<input type="date" class="datepicker" id="due-date" data-value="<?php if(isset($milestone)){echo $milestone['DueDate'];}?>">
+							<?php
+								if(isset($milestone))
+								{
+									$dueDate = $milestone['DueDate'];
+									$dueDate = date('d.m.Y', strtotime($dueDate));
+									if($dueDate == "01.01.2001")
+									{
+										$dueDate = "";
+									}
+								}
+								else
+								{
+									$dueDate = "";
+								}
+							?>
+							<input type="date" class="datepicker" id="due-date" data-value="<?php echo $dueDate;?>">
 						</div>
 					</div>
 				</div>
@@ -174,7 +189,22 @@ else
 					<div class="col s6 m8 offset-m2 l6 offset-l3">
 						<div class="col s12 left-align">
 							<label for="done-date" style="font-size: 1rem;">Completion Date</label>
-							<input type="date" class="datepicker" id="done-date" data-value="<?php if(isset($milestone)){echo $milestone['CompletionDate'];}?>">
+							<?php
+							if(isset($milestone))
+							{
+								$doneDate = $milestone['CompletionDate'];
+								$doneDate = date('d.m.Y', strtotime($doneDate));
+								if($doneDate == "01.01.2001")
+								{
+									$doneDate = "";
+								}
+							}
+							else
+							{
+								$doneDate = "";
+							}
+							?>
+							<input type="date" class="datepicker" id="done-date" data-value="<?php echo $doneDate;?>">
 						</div>
 					</div>
 				</div>