Index: trunk/wp-content/plugins/xpressme/include/pluggable-override.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 122)
+++ trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 123)
@@ -164,8 +164,9 @@
 if ( !function_exists('wp_redirect') ) :
 function wp_redirect($location, $status = 302) {
-	global $is_IIS,$xoops_config;
+	global $is_IIS,$xoops_config,$action;
 	
 	if ($location == 'wp-login.php?loggedout=true') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at wp logout
 	if ($location == 'wp-login.php?action=register') $location = $xoops_config->xoops_url."/register.php";  //wp-register to xoops register
+	if ($action == 'logout') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at comment logout
 
 	$location = apply_filters('wp_redirect', $location, $status);
Index: trunk/wp-content/themes/xpress_default/comments.php
===================================================================
--- trunk/wp-content/themes/xpress_default/comments.php	(revision 122)
+++ trunk/wp-content/themes/xpress_default/comments.php	(revision 123)
@@ -88,5 +88,5 @@
 				<?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 get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
+					<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>
 
 				<?php else : ?>