diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ca8c56ca7..4e5eac4f9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fix: mysql and mysqldump were transposed in upgrade.pl --help
  - fix: adding Matrix listings committing the current version tag
  - fix: user searches in task resource additions in PM not displaying right without both last name and first name present
+ - fix: task editor in PM not actually receiving start/end date information at first
 
 7.0.9
  - Removed the need for DateTime::Cron::Simple, which also added the ability
diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
index 388a15322..5fe69f6b2 100644
--- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm
+++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
@@ -853,13 +853,16 @@ sub www_editTask {
    $var->{'form.header'} .= WebGUI::Form::hidden($session, {
 				-name=>"insertAt",
 				-value=>$form->get("insertAt")
-				});				
-   #Set some hidden variables to make it easy to reset data in javascript
+				});
+
    my $duration = $task->{duration};
-   my $start = $dt->epochToSet($db->quickArray('SELECT startDate FROM PM_task WHERE projectId = ? ORDER BY sequenceNumber LIMIT 1', [$projectId]));
-   my $end = $start;
+   my ($startEpoch, $endEpoch) = $db->quickArray('SELECT startDate, startDate FROM PM_task WHERE projectId = ? ORDER BY sequenceNumber LIMIT 1', [$projectId]);
+   $startEpoch = $task->{startDate} if $task->{startDate};
+   $endEpoch = $task->{endDate} if $task->{endDate};
+   my ($start, $end) = ($dt->epochToSet($startEpoch), $dt->epochToSet($endEpoch));
    my $dependant = $task->{dependants};
-   														   
+
+   # Set some hidden variables to make it easy to reset data in javascript
    $var->{'form.header'} .= WebGUI::Form::hidden($session, {
 				-name=>"orig_duration",
 				-value=>$duration
@@ -875,7 +878,7 @@ sub www_editTask {
    $var->{'form.header'} .= WebGUI::Form::hidden($session, {
 				-name=>"orig_dependant",
 				-value=>$dependant
-				});														   
+				});
    $var->{'form.name'} = WebGUI::Form::text($session,{
 				-name=>"name",
 				-value=>$task->{taskName},