diff --git a/js/main.js b/js/main.js
index 3daa2d11ff334307387ae992970cbc56f68fade4..5b4ad680c7c5ed84e492d60ffd8cf5cb188d2a2b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -290,12 +290,12 @@ function editMilestone(milestone_ID, roadmap_ID)
 
 	if(isNull(dueDate))
 	{
-		dueDate = "01.01.2001";
+		dueDate = "01.01.2000";
 	}
 
 	if(isNull(doneDate))
 	{
-		doneDate = "01.01.2001";
+		doneDate = "01.01.2000";
 	}
 
 	if(done)
@@ -305,7 +305,7 @@ function editMilestone(milestone_ID, roadmap_ID)
 	else
 	{
 		done = 0;
-		doneDate =  "01.01.2001";
+		doneDate =  "01.01.2000";
 	}
 
 	$.post('../admin/helper/edit-milestone.php',
diff --git a/php/admin/admin-edit-milestone.php b/php/admin/admin-edit-milestone.php
index 92001d77aeb7660afc86e3cdea36fd3fe103a30f..0289170506cf6456e592a17793109951e8532ed0 100644
--- a/php/admin/admin-edit-milestone.php
+++ b/php/admin/admin-edit-milestone.php
@@ -138,7 +138,7 @@ else
 								{
 									$dueDate = $milestone['DueDate'];
 									$dueDate = date('d.m.Y', strtotime($dueDate));
-									if($dueDate == "01.01.2001")
+									if($dueDate == "01.01.2000")
 									{
 										$dueDate = "";
 									}
@@ -148,7 +148,7 @@ else
 									$dueDate = "";
 								}
 							?>
-							<input type="date" class="datepicker" id="due-date" data-value="<?php echo $dueDate;?>">
+							<input type="date" class="datepicker" id="due-date" value="<?php echo $dueDate;?>">
 						</div>
 					</div>
 				</div>
@@ -194,7 +194,7 @@ else
 							{
 								$doneDate = $milestone['CompletionDate'];
 								$doneDate = date('d.m.Y', strtotime($doneDate));
-								if($doneDate == "01.01.2001")
+								if($doneDate == "01.01.2000")
 								{
 									$doneDate = "";
 								}
@@ -204,7 +204,7 @@ else
 								$doneDate = "";
 							}
 							?>
-							<input type="date" class="datepicker" id="done-date" data-value="<?php echo $doneDate;?>">
+							<input type="date" class="datepicker" id="done-date" value="<?php echo $doneDate;?>">
 						</div>
 					</div>
 				</div>
diff --git a/php/admin/admin-milestones.php b/php/admin/admin-milestones.php
index dac01a50ab27f0ab5e8d366c8dd15a149577a136..056a5a72c9398e0089fa8cf6ab166c16f6990d49 100644
--- a/php/admin/admin-milestones.php
+++ b/php/admin/admin-milestones.php
@@ -103,14 +103,14 @@ $projectName = $projectName["Projectname"];
 							$status = $milestones[$i]['Status'];
 							$dueDate = $milestones[$i]['DueDate'];
 							$dueDate = date('d.m.Y', strtotime($dueDate));
-							if($dueDate == "01.01.2001")
+							if($dueDate == "01.01.2000")
 							{
 								$dueDate = "";
 							}
 
 							$doneDate = $milestones[$i]['CompletionDate'];
 							$doneDate = date('d.m.Y', strtotime($doneDate));
-							if($doneDate == "01.01.2001")
+							if($doneDate == "01.01.2000")
 							{
 								$doneDate = "";
 							}