diff --git a/form.php b/form.php
index 142b1c2..7118a87 100644
--- a/form.php
+++ b/form.php
@@ -433,6 +433,7 @@ class formfield
       $this->titles = array ("");
     foreach ($this->titles as $key=>$val)
     {
+      $res .= " <div class='checkbox'>\n";
       $res .= "      <input type='hidden'";
       $res .= " name='$this->formName"."[";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."]";
@@ -440,6 +441,11 @@ class formfield
         $res .= "[$key]";
       $res .= "' value='unset'";
       $res .= "/>";
+      $res .= "<label for='$this->formName"."_";
+      $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_";
+      if (count ($this->titles) > 1)
+        $res .= "$key";
+      $res .= "'>";
       $res .= "<input type='checkbox'";
       $res .= " name='$this->formName"."[";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."]";
@@ -492,9 +498,8 @@ class formfield
         $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'";
       }
       $res .= "/>";
-      $res .= "$val\n";
-      if (count ($this->titles) > 1)
-        $res .= "<br/>\n";
+      $res .= "$val</label>\n";
+      $res .= "</div>\n";
     }
 
     if (isset ($this->errors) || isset ($this->help))