diff --git modules/comment/comment.module modules/comment/comment.module
index fe3584b..01f7f94 100644
--- modules/comment/comment.module
+++ modules/comment/comment.module
@@ -1910,7 +1910,7 @@ function comment_form($form, &$form_state, $comment) {
   if ($is_admin) {
     $author = (!$comment->uid && $comment->name ? $comment->name : $comment->registered_name);
     $status = (isset($comment->status) ? $comment->status : COMMENT_NOT_PUBLISHED);
-    $date = (!empty($comment->date) ? $comment->date : format_date($comment->changed, 'custom', 'Y-m-d H:i O'));
+    $date = (!empty($comment->date) ? $comment->date : format_date($comment->created, 'custom', 'Y-m-d H:i O'));
   }
   else {
     if ($user->uid) {
diff --git modules/comment/comment.test modules/comment/comment.test
index fbef5d7..724bd83 100644
--- modules/comment/comment.test
+++ modules/comment/comment.test
@@ -535,7 +535,8 @@ class CommentPreviewTest extends CommentHelperCase {
     $edit['comment_body[' . $langcode . '][0][value]'] = $this->randomName(16);
     $edit['name'] = $web_user->name;
     $edit['date'] = '2008-03-02 17:23 +0300';
-    $expected_date = format_date(strtotime($edit['date']));
+    $expected_text_date = format_date(strtotime($edit['date']));
+    $expected_form_date = format_date(strtotime($edit['date']), 'custom', 'Y-m-d H:i O');
     $comment = $this->postComment($this->node, $edit['subject'], $edit['comment_body[' . $langcode . '][0][value]'], TRUE);
     $this->drupalPost('comment/' . $comment->id . '/edit', $edit, t('Preview'));
 
@@ -544,13 +545,22 @@ class CommentPreviewTest extends CommentHelperCase {
     $this->assertText($edit['subject'], t('Subject displayed.'));
     $this->assertText($edit['comment_body[' . $langcode . '][0][value]'], t('Comment displayed.'));
     $this->assertText($edit['name'], t('Author displayed.'));
-    $this->assertText($expected_date, t('Date displayed.'));
+    $this->assertText($expected_text_date, t('Date displayed.'));
 
     // Check that the title and body fields are displayed with the correct values.
     $this->assertFieldByName('subject', $edit['subject'], t('Subject field displayed.'));
     $this->assertFieldByName('comment_body[' . $langcode . '][0][value]', $edit['comment_body[' . $langcode . '][0][value]'], t('Comment field displayed.'));
     $this->assertFieldByName('name', $edit['name'], t('Author field displayed.'));
     $this->assertFieldByName('date', $edit['date'], t('Date field displayed.'));
+
+    // Check that saving a comment produces a success message.
+    $this->drupalPost('comment/' . $comment->id . '/edit', $edit, t('Save'));
+    $this->assertText(t('Your comment has been posted.'), t('Comment posted.'));
+
+    // Check that the date field is correct after saving the comment.
+    $this->drupalGet('comment/' . $comment->id . '/edit');
+    $this->assertFieldByName('date', $expected_form_date, t('Date field displayed.'));
+    // @todo Add more thorough tests that the comment is saved correctly.
   }
 
 }