diff --git a/lib/WebGUI/Form/Button.pm b/lib/WebGUI/Form/Button.pm
index 9d9b66597..fdf7d8540 100644
--- a/lib/WebGUI/Form/Button.pm
+++ b/lib/WebGUI/Form/Button.pm
@@ -61,6 +61,9 @@ sub definition {
 		defaultValue=>{
 			defaultValue=>$i18n->get(62)
 			},
+                type => {
+                    defaultValue     => 'button',
+                },
 		});
         return $class->SUPER::definition($session, $definition);
 }
@@ -89,7 +92,7 @@ Renders a button.
 sub toHtml {
 	my $self = shift;
  	my $value = $self->fixQuotes($self->getOriginalValue);
-	my $html = '<input type="button" ';
+	my $html = '<input type="' . $self->get('type') . '" ';
 	$html .= 'name="'.$self->get("name").'" ' if ($self->get("name"));
 	$html .= 'id="'.$self->get('id').'" ' unless ($self->get('id') eq "_formId");
 	$html .= 'value="'.$value.'" '.$self->get("extras").' />';
diff --git a/lib/WebGUI/Form/Submit.pm b/lib/WebGUI/Form/Submit.pm
index 5064f8ced..ae0afc428 100644
--- a/lib/WebGUI/Form/Submit.pm
+++ b/lib/WebGUI/Form/Submit.pm
@@ -59,15 +59,8 @@ Renders a button.
 
 sub toHtml {
 	my $self = shift;
-	my $value = $self->fixQuotes($self->getOriginalValue);
-    my $extras = $self->get("extras") || q|class="forwardButton"|;
-	my $i18n = WebGUI::International->new($self->session);
-	$self->{_params}{extras} ||= 'onclick="this.value=\''.$i18n->get(452).'\'"';
-	my $html = '<input type="submit" ';
-	$html .= 'name="'.$self->get("name").'" ' if ($self->get("name"));
-	$html .= 'id="'.$self->get('id').'" ' unless ($self->get('id') eq "_formId");
-	$html .= 'value="'.$value.'" '.$extras.' />';
-	return $html;
+	$self->{_params}{extras} ||= 'class="forwardButton" onclick="this.value=\''.$i18n->get(452).'\'"';
+	return $self->SUPER::toHtml;
 }
 
 1;