diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 683d184d5..b9dd9df97 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -258,14 +258,14 @@ $template->assign(
     'AUTHOR' => htmlspecialchars(
       isset($_POST['author'])
         ? stripslashes($_POST['author'])
-        : ""
+        : (empty($row['author']) ? '' : $row['author'])
       ),
 
     'DATE_CREATION' => $row['date_creation'],
 
     'DESCRIPTION' =>
       htmlspecialchars( isset($_POST['description']) ?
-        stripslashes($_POST['description']) : ""),
+        stripslashes($_POST['description']) : (empty($row['comment']) ? '' : $row['comment'])),
 
     'F_ACTION' =>
         get_root_url().'admin.php'