diff --git a/upload/config.php b/upload/config.php
index 1f29c34b8..d3e4fd6c6 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -63,8 +63,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.4 (beta)';
-$bb_cfg['tp_release_state'] = 'R345';
-$bb_cfg['tp_release_date'] = '31-01-2012';
+$bb_cfg['tp_release_state'] = 'R346';
+$bb_cfg['tp_release_date'] = '01-02-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 55305fef0..5b57b6a0a 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2787,7 +2787,7 @@ function send_pm($user_id, $subject, $message, $poster_id = false)
     {
     	$poster_ip = '7f000001';
     }
-    else if($row = DB()->fetch_row("SELECT user_reg_ip ". BB_USERS ." WHERE user_id = $poster_id"))
+    else if($row = DB()->fetch_row("SELECT user_reg_ip FROM ". BB_USERS ." WHERE user_id = $poster_id"))
     {
     	$poster_ip = $row['user_reg_ip'];
     }
diff --git a/upload/includes/ucp/usercp_email.php b/upload/includes/ucp/usercp_email.php
index 02bf72d76..ef969b8cc 100644
--- a/upload/includes/ucp/usercp_email.php
+++ b/upload/includes/ucp/usercp_email.php
@@ -69,7 +69,7 @@ if ( $row = DB()->fetch_row($sql) )
 				$emailer->from($userdata['user_email']);
 				$emailer->replyto($userdata['user_email']);
 
-				$email_headers = 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
+				$email_headers = 'X-AntiAbuse: Board servername - ' . $bb_cfg['server_name'] . "\n";
 				$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
 				$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
 				$email_headers .= 'X-AntiAbuse: User IP - ' . CLIENT_IP . "\n";