diff --git a/search.php b/search.php
index 556a1870..12bae670 100644
--- a/search.php
+++ b/search.php
@@ -953,7 +953,7 @@ function username_search ($search_match)
 		}
 		if (!$username_list)
 		{
-			$username_list = '<option>'. $lang['NO_MATCH'] .'</option>';
+			$username_list = '<option value="">'. $lang['NO_MATCH'] .'</option>';
 		}
 	}
 
@@ -970,4 +970,4 @@ function username_search ($search_match)
 	));
 
 	print_page('search.tpl', 'simple');
-}
\ No newline at end of file
+}
diff --git a/styles/templates/default/search.tpl b/styles/templates/default/search.tpl
index 97668180..d7e8c340 100644
--- a/styles/templates/default/search.tpl
+++ b/styles/templates/default/search.tpl
@@ -130,6 +130,10 @@
 <script type="text/javascript">
 function refresh_username(selected_username)
 {
+	if (selected_username === '') {
+		return;
+	}
+
 	opener.document.forms['post'].{INPUT_NAME}.value = selected_username;
 	opener.focus();
 	window.close();
@@ -165,4 +169,4 @@ function refresh_username(selected_username)
 </form>
 
 <!--========================================================================-->
-<!-- ENDIF / TPL_SEARCH_USERNAME -->
\ No newline at end of file
+<!-- ENDIF / TPL_SEARCH_USERNAME -->