--- a/index.cgi	Mon Jul 04 22:05:42 2011 +0200
+++ b/index.cgi	Tue Jul 05 00:37:40 2011 +0200
@@ -38,6 +38,9 @@
 
 my %ttconfig = (
     INCLUDE_PATH => "templates",
+    VARIABLES => {
+	SELF => $SELF,
+    },
 );
 
 my $DBH = DBI->connect($DSN, undef, undef, {RaiseError=>1});
@@ -87,7 +90,7 @@
 		$sent = param("mail");
 	    }
 	}
-	$tt->process("html.access.tpl", {
+	$tt->process("html.invitation.tpl", {
 	    sent => $sent,
 	    warn => %warn ? \%warn : undef,
 	    expires => $EXPIRATION,
@@ -128,9 +131,10 @@
 	    confirmed => $confirmed,
 	}, $sendmail)
 	or die $tt->error();
-	close($sendmail);
+	close($sendmail) or die "sendmail: $!\n";
 
-	$tt->process("html.confirm.tpl", {
+
+	$tt->process("html.confirmed.tpl", {
 	    confirmed => $confirmed,
 	    error => delete $data{error},
 	    value => \%data}) or die $tt->error();
@@ -184,7 +188,7 @@
 	    open(my $sendmail => "|$SENDMAIL")
 		or die "Can't open $SENDMAIL: $!\n";
 
-	    $tt->process("mail.confirm.tpl", {
+	    $tt->process("mail.form-ack.tpl", {
 		to => $value{mail},
 		url => {
 		    yes => "$SELF/$r{uuid}.user?confirm=yes",
@@ -195,7 +199,7 @@
 
 	    close($sendmail);
 
-	    $tt->process("html.form.ack.tpl", {
+	    $tt->process("html.form-ack.tpl", {
 		value => \%value,
 		timestamp => $r{timestamp},
 		uuid => $r{uuid},