diff --git a/trunk/locale/en-US.xml b/trunk/locale/en-US.xml
index f1d6bee..99babfe 100755
--- a/trunk/locale/en-US.xml
+++ b/trunk/locale/en-US.xml
@@ -38,8 +38,11 @@
 	<!-- search bar-->
 	<str id="search">search</str>
 	
-	<!-- -->
-	<str id=""></str>
+	<!-- login / register page -->
+	<str id="username">username</str>
+	<str id="password">password</str>
+	<str id="button_register">register</str>
+	<str id="button_login">login</str>
 
 	<!-- dublin core entities -->
 	<str id="DC.title">title</str>
diff --git a/trunk/style/gnutube.css b/trunk/style/gnutube.css
index fea69f0..8606f6a 100755
--- a/trunk/style/gnutube.css
+++ b/trunk/style/gnutube.css
@@ -61,6 +61,17 @@ div
 			vertical-align:		text-top;
 		}
 
+	div.loginform, div.registerform
+	{
+		padding:		1.5em;
+		text-align:		center;
+	}
+	
+	div.loginform form, div.registerform form
+	{
+		margin:			1.5em;
+	}
+
 	div.logo-big
 	{
 		padding-top:	1.5em;
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 8c70a60..68dba85 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -290,17 +290,30 @@
 		</xsl:for-each>
 	</table>
 
-</xsl:template>
+</xsl:template>v
 
 <xsl:template match="registerform">
 
 	<div class="registerform">
 
-		<form action="register.pl" method="post">
+		<form method="post">
+			<xsl:attribute name="action">
+				<xsl:value-of select="$site_strings/str[@id='page_register']" />
+			</xsl:attribute>
 			<fieldset>
+				<xsl:value-of select="$locale_strings/str[@id='username']" />:
+				<br />				
 				<input name="user" type="text" size="30" maxlength="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='password']" />:
+				<br />
 				<input name="pass" type="password" size="30" maxlength="30" />
-				<input type="submit" name="register" value=" register " />
+				<br />
+				<input type="submit" name="register" >
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings/str[@id='button_register']" />
+					</xsl:attribute>
+				</input>
 			</fieldset>
 		</form>
 
@@ -312,12 +325,24 @@
 
 	<div class="loginform">
 
-		<form action="login.pl" method="POST">
+		<form method="post">
+			<xsl:attribute name="action">
+				<xsl:value-of select="$site_strings/str[@id='page_login']" />
+			</xsl:attribute>
 			<fieldset>
-				<input name="action" type="hidden" value="login" />
+				<xsl:value-of select="$locale_strings/str[@id='username']" />:
+				<br />				
 				<input name="user" type="text" size="30" maxlength="30" />
+				<br />
+				<xsl:value-of select="$locale_strings/str[@id='password']" />:
+				<br />
 				<input name="pass" type="password" size="30" maxlength="30" />
-				<input type="submit" name="login" value=" login " />
+				<br />
+				<input type="submit" name="login" >
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings/str[@id='button_login']" />
+					</xsl:attribute>
+				</input>
 			</fieldset>
 		</form>