diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 7bcda12e65..ad71833aa1 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -202,6 +202,7 @@ p a {
 		<li>[Fix] Font colour list having the correct height in IE (Bug #9571)</li>
 		<li>[Feature] Added mark/unmark all links to the bots page (Bug #12461)</li>
 		<li>[Fix] Introduced check on duplicate usernames during bot creation/edit (Bug #12461)</li>
+		<li>[Fix] Allow multibyte letters for smilie codes(Bug #12321)</li>
 		<li>[Fix] Correctly chmod created cache files (Bug #12859)</li>
 		<li>[Fix] Use our global expression for checking email syntax in memberlist (Bug #12827)</li>
 		<li>[Fix] Correctly retrieve/refresh templates stored in database if using subdirectories within template directory (Bug #12839)</li>
@@ -210,6 +211,7 @@ p a {
 		<li>[Fix] Make sure the automatic update is also working for those having fsockopen disabled</li>
 		<li>[Fix] Simulate recache of theme data on automatic update finished page - recaching it if css data changed</li>
 		<li>[Feature] Allow dropping in custom &quot;info_[module class]_*.php&quot; files to language/*/mods directory for inclusion into the menu structure without the need to modify phpBB language files for menu placements</li>
+		<li>[Fix] Added login box to egosearch (Bug #12941)</li>
 
 	</ul>
 
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 720c39635e..641aa74efc 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -47,6 +47,8 @@ $lang = array_merge($lang, array(
 
 	'JUMP_TO_POST'			=> 'Jump to post',
 
+	'LOGIN_EXPLAIN_EGOSEARCH'	=> 'The board requires you to be registered and logged in to view your own posts.',
+
 	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
 	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
 	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
diff --git a/phpBB/search.php b/phpBB/search.php
index cbc5b6732f..0693b32569 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -85,6 +85,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 	if ($search_id == 'egosearch')
 	{
 		$author_id = $user->data['user_id'];
+		
+		if ($user->data['user_id'] == ANONYMOUS)
+		{
+			login_box('', $user->lang['LOGIN_EXPLAIN_EGOSEARCH']);
+		}
 	}
 
 	// If we are looking for authors get their ids