diff --git a/upload/ajax/user_register.php b/upload/ajax/user_register.php
index 933e9672e..2cbd3d2b3 100644
--- a/upload/ajax/user_register.php
+++ b/upload/ajax/user_register.php
@@ -2,7 +2,7 @@
 
 if (!defined('IN_AJAX')) die(basename(__FILE__));
 
-global $bb_cfg, $lang;
+global $bb_cfg, $lang, $userdata;
 
 $mode = (string) $this->request['mode'];
 
@@ -48,7 +48,8 @@ switch($mode)
 			}
 			else
 			{
-				$html = '<img src="./images/good.gif"> <span class="seedmed bold">'.$lang['CHOOSE_PASS_OK'].'</span>';
+				$text = (IS_GUEST) ? $lang['CHOOSE_PASS_REG_OK'] : $lang['CHOOSE_PASS_OK'];
+				$html = '<img src="./images/good.gif"> <span class="seedmed bold">'.$text.'</span>';
 			}
 		}
 	break;
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index aa04e3683..fa930c943 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2598,7 +2598,7 @@ function get_title_match_topics ($title_match_sql, $limit = 500, $forum_ids = ar
 		{
 			$sphinx->SetMatchMode(SPH_MATCH_PHRASE);
 		}
-		if ($result = $sphinx->Query($title_match_sql, 'topics', $userdata['username'] .' ('. USER_IP .')'))
+		if ($result = $sphinx->Query($title_match_sql, 'topics', $userdata['username'] .' ('. CLIENT_IP .')'))
 		{
 			if (!empty($result['matches']))
 			{
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index dd7aeb280..c1b8614b1 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -1587,7 +1587,8 @@ $lang['CHOOSE_A_NAME'] = 'You should choose a name';
 $lang['CHOOSE_E_MAIL'] = 'You must specify the e-mail';
 $lang['CHOOSE_PASS'] = 'Field for the password must not be empty!';
 $lang['CHOOSE_PASS_ERR'] = 'Entered passwords do not match';
-$lang['CHOOSE_PASS_OK'] = 'Passwords match, you can proceed with the registration.';
+$lang['CHOOSE_PASS_OK'] = 'Passwords match';
+$lang['CHOOSE_PASS_REG_OK'] = 'Passwords match, you can proceed with the registration';
 $lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working';
 $lang['TERMS_ON'] = 'I agree with these terms and conditions';
 $lang['TERMS_OFF'] = 'I do not agree to these terms';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 1d6b6c3a1..579c41f6d 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1595,7 +1595,8 @@ $lang['CHOOSE_PASSWORD'] = 'Вы должны указать пароль';
 $lang['CHOOSE_PASS'] = 'Поля для ввода пароля не должны быть пустыми!';
 $lang['CHOOSE_PASS_ERR'] = 'Введённые пароли не совпадают';
 $lang['CHOOSE_PASS_ERR_20'] = 'Пароль должен быть не длиннее 20 символов';
-$lang['CHOOSE_PASS_OK'] = 'Пароли совпадают, можете продолжить регистрацию.';
+$lang['CHOOSE_PASS_OK'] = 'Пароли совпадают';
+$lang['CHOOSE_PASS_REG_OK'] = 'Пароли совпадают, можете продолжить регистрацию';
 $lang['CHOOSE_PASS_FAILED'] = 'Для изменения пароля вы должны правильно указать текущий пароль';
 $lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает';
 $lang['TERMS_ON'] = 'Я <b>согласен</b> с этими условиями';