diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 78f407f..eef4349 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -156,7 +156,7 @@
 	<string id="watch_cortadoapplet">use java applet</string>
 	<string id="license_conditions">license conditions</string>
 	<string id="protip_embed">To embed the video on another web page, use the following HTML code:</string>
-	<string id="comment_on_video">Flamewar area below. Proceed with caution.</string>
+	<string id="login_to_comment">login to comment</string>
 	<string id="comment_post">post</string>
 
 	<!-- embedded video page-->
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 717643c..edc4923 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -97,7 +97,8 @@ div
 	div.loginform,
 	div.registerform,
 	div.settingsform,
-	div.uploadform
+	div.uploadform,
+	div.commentform
 	{
 		line-height:	2.5em;
 		margin:			1.5em;
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index 768c9f1..77d0ab7 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -193,12 +193,8 @@ not implemented right now
 			</span>
 		</div>
 
-<!--
-		too ugly right now
-
-		<xsl:call-template name="comments"/>
 		<xsl:call-template name="commentform"/>
--->
+		<xsl:call-template name="comments"/>
 	
 	</xsl:if>
 </xsl:template>
@@ -206,10 +202,6 @@ not implemented right now
 <xsl:template name="comments">
 
 	<div class="comments">
-		<span class="protip">
-			<xsl:value-of select="$locale_strings[@id='comment_on_video']" />
-		</span>
-		<br />
 		<xsl:for-each select="//comments/comment">
 			<div class="comment">
 				<a>
@@ -228,7 +220,8 @@ not implemented right now
 
 <xsl:template name="commentform">
 
-		<xsl:if test="not(//@username='')">
+	<xsl:choose>
+		<xsl:when test="not(//@username='')">
 			<div class="commentform">
 				<form method="post">
 					<xsl:attribute name="action">
@@ -246,7 +239,15 @@ not implemented right now
 					</fieldset>
 				</form>
 			</div>
-		</xsl:if>
+		</xsl:when>
+		<xsl:otherwise>
+			<div class="commentform">
+				<span class="protip">
+					<xsl:value-of select="$locale_strings[@id='login_to_comment']" />
+				</span>
+			</div>
+		</xsl:otherwise>
+	</xsl:choose>
 
 </xsl:template>