diff --git a/lib/WebGUI/Account/Contributions.pm b/lib/WebGUI/Account/Contributions.pm
index 79efd1249..57a2d95f2 100644
--- a/lib/WebGUI/Account/Contributions.pm
+++ b/lib/WebGUI/Account/Contributions.pm
@@ -41,23 +41,23 @@ sub editSettingsForm {
     my $session = $self->session;
     my $setting = $session->setting;
     my $i18n    = WebGUI::International->new($session,'Account_Contributions');
-    my $f       = WebGUI::HTMLForm->new($session);
+    my $f       = WebGUI::FormBuilder->new($session);
 
-    $f->template(
+    $f->addField( "template",
 		name      => "contribStyleTemplateId",
 		value     => $self->getStyleTemplateId,
 		namespace => "style",
 		label     => $i18n->get("contrib style template label"),
         hoverHelp => $i18n->get("contrib style template hoverHelp")
     );
-    $f->template(
+    $f->addField( "template",
 		name      => "contribLayoutTemplateId",
 		value     => $self->getLayoutTemplateId,
 		namespace => "Account/Layout",
 		label     => $i18n->get("contrib layout template label"),
         hoverHelp => $i18n->get("contrib layout template hoverHelp")
     );
-    $f->template(
+    $f->addField( "template",
 		name      => "contribViewTemplateId",
 		value     => $self->getViewTemplateId,
 		namespace => "Account/Contrib/View",
@@ -65,7 +65,7 @@ sub editSettingsForm {
         hoverHelp => $i18n->get("contrib view template hoverHelp")
     );
 
-    return $f->printRowsOnly;
+    return $f;
 }
 
 #-------------------------------------------------------------------
diff --git a/t/tests/Test/WebGUI/Account/Contributions.pm b/t/tests/Test/WebGUI/Account/Contributions.pm
new file mode 100644
index 000000000..5e9469d04
--- /dev/null
+++ b/t/tests/Test/WebGUI/Account/Contributions.pm
@@ -0,0 +1,18 @@
+package Test::WebGUI::Account::Contributions;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use warnings;
+
+use base qw/Test::WebGUI::Account/;
+
+1;