diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 201592e30..02c9b12dd 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -63,6 +63,9 @@ if ( isset( $_POST['submit'] ) )
   if ( isset( $_POST['uploadable'] ) )
     $query.= ", uploadable = '".$_POST['uploadable']."'";
 
+  if ( isset( $_POST['commentable'] ) )
+    $query.= ", commentable = '".$_POST['commentable']."'";
+
   if ( isset( $_POST['associate'] ) )
   {
     $query.= ', id_uppercat = ';
diff --git a/picture.php b/picture.php
index 6e4a73709..c4dd73154 100644
--- a/picture.php
+++ b/picture.php
@@ -784,7 +784,7 @@ foreach ($cat_array as $category)
   }
   // the picture is commentable if it belongs at least to one category which
   // is commentable
-  if ($category['commentable'])
+  if ($category['commentable'] == 'true')
   {
     $page['show_comments'] = true;
   }
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
index 04c48112a..bd25ac1b6 100644
--- a/template/default/admin/cat_modify.tpl
+++ b/template/default/admin/cat_modify.tpl
@@ -61,8 +61,8 @@
     <tr>
       <td><strong>{L_EDIT_COMMENTABLE}&nbsp;:</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></td>
       <td class="row1">
-          <input type="radio" class="radio" name="commentable" value="false" {COMMENTABLE_TRUE} />{L_YES}&nbsp;&nbsp;
-          <input type="radio" class="radio" name="commentable" value="true" {COMMENTABLE_FALSE} />{L_NO}
+          <input type="radio" class="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}&nbsp;&nbsp;
+          <input type="radio" class="radio" name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
       </td>
     </tr>
     <!-- BEGIN upload -->