diff --git a/config.php b/config.php
index aa4eb098..4c147b84 100644
--- a/config.php
+++ b/config.php
@@ -150,6 +150,9 @@ $config = array(
 		3 => 'Paladin Sample',
 		4 => 'Knight Sample'
 	),
+	
+	// it must show limited number of players after using search in character page
+	'characters_search_limit' => 15,
 
 	// town list used when creating character
 	// won't be displayed if there is only one item (rookgaard for example)
diff --git a/system/pages/characters.php b/system/pages/characters.php
index 66aaf9c1..aa3d78bb 100644
--- a/system/pages/characters.php
+++ b/system/pages/characters.php
@@ -432,7 +432,7 @@ else
 	if($db->hasColumn('players', 'deletion'))
 		$deleted = 'deletion';
 
-	$query = $db->query('SELECT `name`, `level`, `vocation`' . $promotion . ' FROM `players` WHERE `name` LIKE  ' . $db->quote('%' . $name . '%') . ' AND ' . $deleted . ' != 1;');
+	$query = $db->query('SELECT `name`, `level`, `vocation`' . $promotion . ' FROM `players` WHERE `name` LIKE  ' . $db->quote('%' . $name . '%') . ' AND ' . $deleted . ' != 1 LIMIT ' . (int)config('characters_search_limit') . ';');
 	if($query->rowCount() > 0)
 	{
 		echo 'Did you mean:<ul>';