Index: branches/htmlform/cgi-bin/main.cgi
===================================================================
--- branches/htmlform/cgi-bin/main.cgi	(revision 495)
+++ branches/htmlform/cgi-bin/main.cgi	(revision 497)
@@ -88,5 +88,5 @@
 
 my $page;
-if (-e "$ENV{HTML_TEMPLATE_ROOT}/admin/$webvar{action}.tmpl") {
+if (-e "$ENV{HTML_TEMPLATE_ROOT}/$webvar{action}.tmpl") {
   $page = HTML::Template->new(filename => "$webvar{action}.tmpl");
 } else {
@@ -766,6 +766,6 @@
 	if $webvar{userid};
 
-##fixme:  this is only needed iff confirm.tmpl/confirm.html and
-# confirmRemove.html/confirmRemove.tmpl are merged (quite possible, just
+##fixme:  this is only needed iff confirm.tmpl and
+# confirmRemove.tmpl are merged (quite possible, just
 # a little tedious)
   $page->param(action => "insert");