diff -u -p -F^function -r1.5.2.5 watermark.module
--- watermark.module	7 Jul 2007 17:53:29 -0000	1.5.2.5
+++ watermark.module	17 May 2008 20:07:52 -0000
@@ -137,16 +137,11 @@ function watermark_admin_settings() {
     '#description' => t('Check which images you want to apply watermarks for.'),
   );
 
-  foreach (_image_get_sizes() as $size) {
-    $label_list[] = $size['label'];
-  }
-  $label_list[] = IMAGE_ORIGINAL;
-
-  foreach ($label_list as $label) {
-    $label_var = WATERMARK . $label;
+   foreach (_image_get_sizes() as $id => $size) {
+    $label_var = WATERMARK . $id;
     $form['watermark']['labels'][$label_var] = array(
       '#type' => 'checkbox',
-      '#title' => $label,
+      '#title' => $size['label'] . " ($id)",
       '#default_value' => variable_get($label_var, false),
     );
   }