Index: trunk/wp-content/plugins/xpressme/include/pluggable-override.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 127)
+++ trunk/wp-content/plugins/xpressme/include/pluggable-override.php	(revision 130)
@@ -67,13 +67,14 @@
 function xpress_login(){
 	global $current_user;
+	global $xoopsModule,$xoopsUser,$xoopsUserIsAdmin;
 	
-	if(is_object($GLOBALS["xoopsUser"])){
-		$u_name = $GLOBALS["xoopsUser"]->getVar("uname");
-		$u_pass_md5 = $GLOBALS["xoopsUser"]->getVar("pass");	
+	if(is_object($xoopsUser)){
+		$u_name = $xoopsUser->getVar("uname");
+		$u_pass_md5 = $xoopsUser->getVar("pass");	
 		if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
 			include_once dirname( __FILE__ ).'/user_sync_xoops.php';
 			repair_user_meta_prefix();  //Repair when data base prefix is changed on XOOPS side
 			$messege = '';
-			$ret = user_sync_to_wordpress($GLOBALS["xoopsUser"]->getVar("uid"),$messege);
+			$ret = user_sync_to_wordpress($xoopsUser->getVar("uid"),$messege);
 			if ($ret){
 				$user = new WP_User(0, $u_name);
@@ -130,12 +131,10 @@
 	global $wp_hasher;
 
+	if ($hash == $password){ // The password taken out of XOOPS is hash value.
+		return apply_filters('check_password', true, $password, $hash, $user_id);
+	}
 	// If the hash is still md5...
 	if ( strlen($hash) <= 32 ) {
-		if (( $hash == md5($password)) || ($hash == $password)) {  // The password taken out of XOOPS is hash value.
-			$check = true;
-		} else {
-			$check = false;
-		}
-
+		$check = ( $hash == md5($password) );	
 /* A new hash is not used because it differs from the hash on the XOOPS password. 
  *		if ( $check && $user_id ) {
Index: trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 127)
+++ trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php	(revision 130)
@@ -138,8 +138,8 @@
 					$sycc_user = new WP_User($wp_user_id);
 					$sycc_user->set_role($capabillities_name);
-					$message .= '...UPDATE ' . $user_login_name . '(' . $capabillities_name . ')';
+					$message .= '...UPDATE ' . $xoops_user->uname . '(' . $capabillities_name . ')';
 
 				} else {
-					$message .= '...UPDATE ' . $user_login_name . '(Level Not Change)';
+					$message .= '...UPDATE ' . $xoops_user->uname . '(Level Not Change)';
 				}
 			}else{