diff --git a/trunk/include.pl b/trunk/include.pl
index 9704ab5..e80ee3f 100644
--- a/trunk/include.pl
+++ b/trunk/include.pl
@@ -17,4 +17,5 @@ $dbhost = 'localhost';
 $dbuser = 'root';
 $dbpass = '';
 $session_name = 'sid';
+$XMLDecl = '<?xml version="1.0" encoding="UTF-8" ?><?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>';
 1;
diff --git a/trunk/index.pl b/trunk/index.pl
index b6505d1..c04e71a 100644
--- a/trunk/index.pl
+++ b/trunk/index.pl
@@ -18,6 +18,6 @@ fill_tagcloud;
 print $session->header(-type=>'text/xml');
 
 #print xml
-print XMLout($page, KeyAttr => {}, XMLDecl => '<?xml version="1.0" encoding="ISO-8859-1" ?><?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>', RootName => 'page');
+print XMLout($page, KeyAttr => {}, XMLDecl => $XMLDecl, RootName => 'page');
 
 
diff --git a/trunk/index.xml b/trunk/index.xml
index 17f6607..71213ae 100755
--- a/trunk/index.xml
+++ b/trunk/index.xml
@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>
-
 <page
 	locale="en-US"
 	stylesheet="./style/gnutube.css"
diff --git a/trunk/register.pl b/trunk/register.pl
index 24854f4..93ea57b 100644
--- a/trunk/register.pl
+++ b/trunk/register.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 require "include.pl";
+require "functions.pl";
 
 #initialize session data
 CGI::Session->name($session_name);
@@ -29,10 +30,14 @@ if($query->param('user') and $query->param('pass'))
 else
 {
 	#if not, print register form
-	print $session->header();
-	print '<?xml version="1.0" encoding="ISO-8859-1" ?>';			# josch, sanitize this
-	print '<?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>';			# josch, sanitize this
-	print '<page locale="en-US" stylesheet="./style/gnutube.css" username="">';				# josch, sanitize this
-	print '<registerform />';
-	print '</page>';				# josch, sanitize this
+
+	$page = XMLin("$gnutube_root/register.xml", ForceArray => 1, KeyAttr => {} );
+
+	#if a username is associated with session id, username is nonempty
+	$page->{username} = get_username_from_sid($session->id);
+
+	#print xml http header along with session cookie
+	print $session->header(-type=>'text/xml');
+
+	print XMLout($page, KeyAttr => {}, XMLDecl => $XMLDecl, RootName => 'page');
 }
diff --git a/trunk/register.xml b/trunk/register.xml
new file mode 100644
index 0000000..1eb28b6
--- /dev/null
+++ b/trunk/register.xml
@@ -0,0 +1,7 @@
+<page
+	locale="en-US"
+	stylesheet="./style/gnutube.css"
+	username=""
+	>
+	<registerform />
+</page>
diff --git a/trunk/search.pl b/trunk/search.pl
index 8e631ac..9095f38 100644
--- a/trunk/search.pl
+++ b/trunk/search.pl
@@ -60,7 +60,7 @@ if($query->param('query'))
 	print $session->header(-type=>'text/xml');
 
 	#print xml
-	print XMLout($page, KeyAttr => {}, XMLDecl => '<?xml version="1.0" encoding="ISO-8859-1" ?><?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>', RootName => 'page');
+	print XMLout($page, KeyAttr => {}, XMLDecl => $XMLDecl, RootName => 'page');
 }
 else
 {
diff --git a/trunk/search.xml b/trunk/search.xml
index b0ed861..376caf4 100755
--- a/trunk/search.xml
+++ b/trunk/search.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>
-
 <page
 	locale="en-US"
 	stylesheet="./style/gnutube.css"
-	username="pedobear@myopenid.net"
+	username=""
 	xmlns:dc="http://purl.org/dc/elements/1.1/"
 	xmlns:cc="http://web.resource.org/cc/"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index de95fe7..e3d78a2 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -245,7 +245,7 @@
 			</fieldset>
 		</form>
 
-	<div>
+	</div>
 
 </xsl:template>