diff --git a/lib/WebGUI/Account/User.pm b/lib/WebGUI/Account/User.pm
index 9e76c5ed5..656439f52 100644
--- a/lib/WebGUI/Account/User.pm
+++ b/lib/WebGUI/Account/User.pm
@@ -53,28 +53,28 @@ sub editSettingsForm {
     my $session = $self->session;
     my $setting = $session->setting;
     my $i18n    = WebGUI::International->new($session,'Account_User');
-    my $f       = WebGUI::HTMLForm->new($session);
+    my $f       = WebGUI::FormBuilder->new($session);
 
-    $f->template(
+    $f->addField( "template",
 		name      => "userAccountStyleTemplateId",
 		value     => $self->getStyleTemplateId,
 		namespace => "style",
 		label     => $i18n->get("user style template label"),
         hoverHelp => $i18n->get("user style template hoverHelp")
     );
-    $f->template(
+    $f->addField( "template",
 		name      => "userAccountLayoutTemplateId",
 		value     => $self->getLayoutTemplateId,
 		namespace => "Account/Layout",
 		label     => $i18n->get("user layout template label"),
         hoverHelp => $i18n->get("user layout template hoverHelp")
     );
-    $f->raw(q{<tr><td class="formDescription" colspan="2">&nbsp</td></tr>});
-    $f->readOnly (
+    $f->addField( "readOnly",
+        name => 'templateMessage',
         value     => $i18n->get("templates in auth method message"),
     );
 
-    return $f->printRowsOnly;
+    return $f;
 }
 
 #-------------------------------------------------------------------
diff --git a/t/tests/Test/WebGUI/Account/User.pm b/t/tests/Test/WebGUI/Account/User.pm
new file mode 100644
index 000000000..86b1710f2
--- /dev/null
+++ b/t/tests/Test/WebGUI/Account/User.pm
@@ -0,0 +1,18 @@
+package Test::WebGUI::Account::User;
+
+#-------------------------------------------------------------------
+# 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;