Index: trunk/wp-content/themes/xpress_default/comments.php
===================================================================
--- trunk/wp-content/themes/xpress_default/comments.php	(revision 150)
+++ trunk/wp-content/themes/xpress_default/comments.php	(revision 168)
@@ -36,5 +36,4 @@
 <?php if ('open' == $post->comment_status) : ?>
 	<div id="xpress-respond">
-
 		<h3><?php comment_form_title( __('Leave a Reply', 'xpress'), __('Leave a Reply for %s' , 'xpress') ); ?></h3>
 	</div>
@@ -42,11 +41,11 @@
 	<div id="cancel-comment-reply"> 
 		<small><?php cancel_comment_reply_link() ?></small>
-		</div> 
+	</div> 
 	
-		<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-			<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
-		<?php else : ?>
+	<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+		<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
+	<?php else : ?>
+		<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 			<div id="xpress-comment-user">
-				<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 				<?php if ( $user_ID ) : ?>
 					<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
@@ -72,8 +71,7 @@
 				<?php comment_id_fields(); ?> 	
 				<?php do_action('comment_form', $post->ID); ?>
-				</form>
 			</div>
-		<?php endif; // If registration required and not logged in ?>
-	</div>
+		</form>
+	<?php endif; // If registration required and not logged in ?>
 
 <?php endif; // if you delete this the sky will fall on your head ?>