diff --git a/lib/WebGUI/Form/CheckList.pm b/lib/WebGUI/Form/CheckList.pm
index 6ee9e0b14..bcd62b9ef 100644
--- a/lib/WebGUI/Form/CheckList.pm
+++ b/lib/WebGUI/Form/CheckList.pm
@@ -130,9 +130,10 @@ sub toHtml {
     if ($self->get("showSelectAll")) {
         $output .= $self->getSelectAllButton;
     }
-
+    my $i=0;
     tie my %options, 'Tie::IxHash', $self->orderedHash();
 	foreach my $key (keys %options) {
+	$i++;
         my $checked = (grep { $_ eq $key } @{ $self->get('value') })
                     ? 1
                     : 0
@@ -144,8 +145,9 @@ sub toHtml {
                 value   => $key,
                 extras  => $self->get('extras'),
                 checked => $checked,
+                id => $self->get('name').$i,
             })->toHtml
-            . ${$self->get('options')}{$key} 
+            . '<label for="'.$self->get('name').$i.'">'.$self->get('options')->{$key}."</label>" 
             . $alignment
             ;
     }
diff --git a/lib/WebGUI/Form/RadioList.pm b/lib/WebGUI/Form/RadioList.pm
index f6547bce8..ed56967bf 100644
--- a/lib/WebGUI/Form/RadioList.pm
+++ b/lib/WebGUI/Form/RadioList.pm
@@ -106,7 +106,9 @@ sub toHtml {
         my %options;
         tie %options, 'Tie::IxHash';
         %options = $self->orderedHash;
+	my $i=0;
 	foreach my $key (keys %options) {
+		$i++;
                 my $checked = 0;
                 if ($self->get('value') eq $key) {
                         $checked = 1;
@@ -115,9 +117,10 @@ sub toHtml {
                         name=>$self->get('name'),
                         value=>$key,
                         extras=>$self->get('extras'),
-                        checked=>$checked
+                        checked=>$checked,
+                        id=>$self->get('name').$i
                         })->toHtml;
-                $output .= $self->get('options')->{$key} . $alignment;
+                $output .= '<label for="'.$self->get('name').$i.'">'.$self->get('options')->{$key}."</label>" . $alignment;
         }
         return $output;
 }