diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 239cd5b..db7b100 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1898,7 +1898,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->created, 'custom', 'Y-m-d H:i O'));
+    $date = (!empty($comment->date) ? $comment->date : format_date($comment->created, 'custom', 'Y-m-d H:i:s O'));
   }
   else {
     if ($user->uid) {
@@ -1908,7 +1908,7 @@ function comment_form($form, &$form_state, $comment) {
       $author = ($comment->name ? $comment->name : '');
     }
     $status = (user_access('skip comment approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED);
-    $date = '';
+    $date = (!empty($comment->created) ? format_date($comment->created, 'custom', 'Y-m-d H:i:s O') : '');
   }
 
   // Add the author name field depending on the current user.