diff --git a/trunk/login.pl b/trunk/login.pl
index ff32e7c..44ff9e7 100644
--- a/trunk/login.pl
+++ b/trunk/login.pl
@@ -144,9 +144,8 @@ if($query->param('action'))
 		}
 		else
 		{
-			#someone is messing with the args
-			$page->{'message'}->{'type'} = "error";
-			$page->{'message'}->{'text'} = "error_202c";
+			#if not, print login form
+			$page->{'loginform'}->{'action'} = 'openid';
 	
 			#print xml http header along with session cookie
 			print $session->header(-type=>'text/xml', -charset=>'UTF-8');
@@ -183,7 +182,7 @@ elsif($username)
 else
 {
 	#if not, print login form
-	$page->{loginform} = [''];
+	$page->{'loginform'} = [''];
 	
 	#print xml http header along with session cookie
 	print $session->header(-type=>'text/xml', -charset=>'UTF-8');
diff --git a/trunk/site/gnutube.xml b/trunk/site/gnutube.xml
index 0d2a89d..385b0e8 100755
--- a/trunk/site/gnutube.xml
+++ b/trunk/site/gnutube.xml
@@ -13,13 +13,13 @@
 	<str id=""></str>-->
 	<str id="page_account">/account.pl</str>
 	<str id="page_bookmarks"></str>
-	<str id="page_login">login.pl</str>
-	<str id="page_login-openid">login-openid.pl</str>
-	<str id="page_logout">login.pl?action=logout</str>
+	<str id="page_login">/login.pl</str>
+	<str id="page_login-openid">/login.pl?action=openid</str>
+	<str id="page_logout">/login.pl?action=logout</str>
 	<str id="page_gnutube-authors">INSERT LINK TO GNUTUBE AUTHORS HERE</str>
 	<str id="page_gnutube-license">http://gplv3.fsf.org/agplv3-dd1.html</str>
 	<str id="page_gnutube-source-code">http://mister-muffin.de/proj/browser</str>
-	<str id="page_register">register.pl</str>
+	<str id="page_register">/register.pl</str>
 	<str id="page_results">search.pl?query=</str>
 	<str id="page_upload">/upload.pl</str>
 	<str id="page_uploader">uploader.pl</str>
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index b578d59..f694725 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -358,45 +358,66 @@
 	<xsl:call-template name="searchbar"/>
 
 	<div class="loginform">
-
-		<form method="post">
-			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_login']" />
-			</xsl:attribute>
-			<fieldset>
-				<input name="action" type="hidden" value="login" />
-				<xsl:value-of select="$locale_strings[@id='username']" />:
-				<br />				
-				<input name="user" type="text" size="30" maxlength="30" />
-				<br />
-				<xsl:value-of select="$locale_strings[@id='password']" />:
-				<br />
-				<input name="pass" type="password" size="30" maxlength="30" />
-				<br />
-				<input type="submit" name="login" >
-					<xsl:attribute name="value">
-						<xsl:value-of select="$locale_strings[@id='button_login']" />
+		<xsl:choose>
+			<xsl:when test="//loginform/@action='openid'">
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_login']" />
 					</xsl:attribute>
-				</input>
-			</fieldset>
-		</form>
-		<form method="post">
-			<xsl:attribute name="action">
-				<xsl:value-of select="$site_strings[@id='page_login']" />
-			</xsl:attribute>
-			<fieldset>
-				<input name="action" type="hidden" value="openid" />
-				<xsl:value-of select="$locale_strings[@id='username']" />:
-				<br />				
-				<input name="user" type="text" size="30" maxlength="30" />
-				<br />
-				<input type="submit" name="login" >
-					<xsl:attribute name="value">
-						<xsl:value-of select="$locale_strings[@id='button_login']" />
+					<fieldset>
+						<input name="action" type="hidden" value="openid" />
+						OpenID:
+						<br />
+						<input name="user" type="text" style="background: url(http://stat.livejournal.com/img/openid-inputicon.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px;" />
+						<br />
+						e.g. http://username.myopenid.com
+						<br />
+						<input type="submit" name="login" >
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_login']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="$site_strings[@id='page_login']" />
+							</xsl:attribute>
+							login with normal account
+						</a>
+					</fieldset>
+				</form>
+			</xsl:when>
+			<xsl:otherwise>
+				<form method="post">
+					<xsl:attribute name="action">
+						<xsl:value-of select="$site_strings[@id='page_login']" />
 					</xsl:attribute>
-				</input>
-			</fieldset>
-		</form>
+					<fieldset>
+						<input name="action" type="hidden" value="login" />
+						<xsl:value-of select="$locale_strings[@id='username']" />:
+						<br />				
+						<input name="user" type="text" size="30" maxlength="30" />
+						<br />
+						<xsl:value-of select="$locale_strings[@id='password']" />:
+						<br />
+						<input name="pass" type="password" size="30" maxlength="30" />
+						<br />
+						<input type="submit" name="login" >
+							<xsl:attribute name="value">
+								<xsl:value-of select="$locale_strings[@id='button_login']" />
+							</xsl:attribute>
+						</input>
+						<br />
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="$site_strings[@id='page_login-openid']" />
+							</xsl:attribute>
+							login with openid
+						</a>
+					</fieldset>
+				</form>
+			</xsl:otherwise>
+		</xsl:choose>
 	</div>
 
 </xsl:template>