--- trunk/lib/Frey/Action.pm	2009/07/02 17:49:04	1162
+++ trunk/lib/Frey/Action.pm	2009/07/05 21:25:25	1171
@@ -382,10 +382,13 @@
 			|;
 		}
 
+		my $submit = $self->_label( 'submit' );
+		$submit =~ s{^submit$}{Run $class};
+
 		$html .= qq|
 			<form name="$form_id" id="$form_id" method="post">
 			$form
-			<input type="submit" value="Run $class">
+			<input type="submit" value="$submit">
 			</form>
 		|;
 		$html .= $self->class->form_footer if $self->class->can('form_footer');
@@ -399,6 +402,8 @@
 		},
 	});
 
+	$self->title( $self->class->title ) if $self->class->title;
+
 	return ($html,$default) if wantarray;
 	return $html;
 }