diff --git a/trunk/settings.pl b/trunk/settings.pl
index d9ce101..4bc0776 100644
--- a/trunk/settings.pl
+++ b/trunk/settings.pl
@@ -21,7 +21,6 @@ if($userinfo->{'username'})
 	
 if($userinfo->{'username'})
 {
-	$page->{'settings'}->{'show'} = 'settings';
 	$page->{'settings'}->{'locale'} = $userinfo->{'locale'};
 	$page->{'settings'}->{'pagesize'} = $userinfo->{'pagesize'};
 	$page->{'settings'}->{'cortado'} = $userinfo->{'cortado'}
diff --git a/trunk/site/main.xml b/trunk/site/main.xml
index de0d1ff..7363891 100755
--- a/trunk/site/main.xml
+++ b/trunk/site/main.xml
@@ -8,7 +8,7 @@
 	<string id="site_motto">WebTV free as in Speech</string>
 
 	<!-- invisible -->
-	<string id="page_account">/settings.pl</string>
+	<string id="page_settings">/settings.pl</string>
 	<string id="page_login">/login.pl</string>
 	<string id="page_login-openid">/login.pl?action=openid</string>
 	<string id="page_logout">/login.pl?action=logout</string>
diff --git a/trunk/xsl/xhtml/account.xsl b/trunk/xsl/xhtml/settings.xsl
similarity index 74%
rename from trunk/xsl/xhtml/account.xsl
rename to trunk/xsl/xhtml/settings.xsl
index 087ae82..f8fc70b 100644
--- a/trunk/xsl/xhtml/account.xsl
+++ b/trunk/xsl/xhtml/settings.xsl
@@ -8,18 +8,18 @@
 >
 
 <xsl:template name="settings">
-	<h2><xsl:value-of select="$locale_strings[@id='account_settings']" /></h2>
+	<h2><xsl:value-of select="$locale_strings[@id='settings_settings']" /></h2>
 	<form method="POST">
 		<xsl:attribute name="action">
-			<xsl:value-of select="$site_strings[@id='page_account']" />
+			<xsl:value-of select="$site_strings[@id='page_settings']" />
 		</xsl:attribute>
 		<input type="hidden" name="show" value="settings" />
 		<div>
-			<h3><xsl:value-of select="$locale_strings[@id='account_locale']" /></h3>
+			<h3><xsl:value-of select="$locale_strings[@id='settings_locale']" /></h3>
 			<br />
 			<select name="locale" size="2">
 				<option value="en-us">
-					<xsl:if test="//account/@locale='en-us'">
+					<xsl:if test="//settings/@locale='en-us'">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -27,7 +27,7 @@
 					<xsl:value-of select="$locale_strings[@id='language_en-us']" />
 				</option>
 				<option value="de-de">
-					<xsl:if test="//account/@locale='de-de'">
+					<xsl:if test="//settings/@locale='de-de'">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -37,11 +37,11 @@
 			</select>
 		</div>
 		<div>
-			<h3><xsl:value-of select="$locale_strings[@id='account_pagesize']" /></h3>
+			<h3><xsl:value-of select="$locale_strings[@id='settings_pagesize']" /></h3>
 			<br />
 			<select name="pagesize" size="7">
 				<option>
-					<xsl:if test="//account/@pagesize=1">
+					<xsl:if test="//settings/@pagesize=1">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -49,7 +49,7 @@
 					1
 				</option>
 				<option>
-					<xsl:if test="//account/@pagesize=2">
+					<xsl:if test="//settings/@pagesize=2">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -57,7 +57,7 @@
 					2
 				</option>
 				<option>
-					<xsl:if test="//account/@pagesize=5">
+					<xsl:if test="//settings/@pagesize=5">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -65,7 +65,7 @@
 					5
 				</option>
 				<option>
-					<xsl:if test="//account/@pagesize=10">
+					<xsl:if test="//settings/@pagesize=10">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -73,7 +73,7 @@
 					10
 				</option>
 				<option>
-					<xsl:if test="//account/@pagesize=20">
+					<xsl:if test="//settings/@pagesize=20">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -81,7 +81,7 @@
 					20
 				</option>
 				<option>
-					<xsl:if test="//account/@pagesize=50">
+					<xsl:if test="//settings/@pagesize=50">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -89,7 +89,7 @@
 					50
 				</option>
 				<option>
-					<xsl:if test="//account/@pagesize=100">
+					<xsl:if test="//settings/@pagesize=100">
 						<xsl:attribute name="selected">
 							selected
 						</xsl:attribute>
@@ -99,9 +99,9 @@
 			</select>
 		</div>
 		<div>
-			<h3><xsl:value-of select="$locale_strings[@id='account_cortado']" /></h3>
+			<h3><xsl:value-of select="$locale_strings[@id='settings_cortado']" /></h3>
 			<input type="radio" name="cortado" value="1">
-				<xsl:if test="//account/@cortado=1">
+				<xsl:if test="//settings/@cortado=1">
 					<xsl:attribute name="checked">
 						checked
 					</xsl:attribute>
@@ -110,7 +110,7 @@
 			<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
 			<br />
 			<input type="radio" name="cortado" value="0">
-				<xsl:if test="//account/@cortado=0">
+				<xsl:if test="//settings/@cortado=0">
 					<xsl:attribute name="checked">
 						checked
 					</xsl:attribute>