Index: trunk/wp-content/plugins/xpressme/include/pluggable-override.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 96)
+++ trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 114)
@@ -22,9 +22,17 @@
 
 	if ($xoopsModule){
+		if (!is_object($xoopsUser)){
+				wp_set_current_user(0);
+				wp_logout();
+			 	return false;
+		}
 		if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
 			return false;
 
-		if ( ! empty($current_user) )
-			return;
+		if ( ! empty($current_user) ){
+			$xoops_user = $xoopsUser->getVar("uname");
+			if ($current_user->user_login == $xoops_user)
+				return;
+		}
 
 		if (check_xpress_auth_cookie()){	//The cookie is login user's or it checks it
@@ -156,8 +164,8 @@
 if ( !function_exists('wp_redirect') ) :
 function wp_redirect($location, $status = 302) {
-	global $is_IIS;
+	global $is_IIS,$xoops_config;
 	
-	if ($location == 'wp-login.php?loggedout=true') $location = XOOPS_URL.'/user.php?op=logout'; //xoops logout at wp logout
-	if ($location == 'wp-login.php?action=register') $location = XOOPS_URL."/register.php";  //wp-register to xoops register
+	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
 
 	$location = apply_filters('wp_redirect', $location, $status);