--- trunk/lib/Frey/Action.pm	2009/07/01 12:23:58	1142
+++ trunk/lib/Frey/Action.pm	2009/07/02 15:56:40	1160
@@ -292,7 +292,6 @@
 			$label_title .= qq| class="required"|;
 			$value_html =~ s{(<\S+)\s}{$1 class=required };
 		}
-		$label =~ s/_/ /g;
 
 		my $set = $name;
 		$set =~ s{_[^_]+$}{};
@@ -310,9 +309,10 @@
 					</fieldset>
 				|;
 			}
-			$label =~ s{^\Q$set\E\s+}{};
+			$label =~ s{^\Q$set\E_+}{};
 		}
 
+		$label = $self->_label( $label );
 		$form .= qq|$before<label for="$name"$label_title>$label</label>$value_html $after|;
 		my $ll = length($label);
 		$label_width = $ll if $ll > $label_width;
@@ -386,6 +386,17 @@
 	return $html;
 }
 
+sub _label {
+	my ($self,$name) = @_;
+	my $labels = $self->class->form_labels if $self->class->can('form_labels');
+	my $label = $labels->{$name};
+	if ( ! defined $label ) {
+		$label = $name;
+		$label =~ s{_}{ }g;
+	}
+	return $label;
+}
+
 =head1 SEE ALSO
 
 L<http://www.quirksmode.org/css/forms.html> for info on CSS2 forms