diff --git a/upload/includes/functions_validate.php b/upload/includes/functions_validate.php
index 6f47589bb..84386276e 100644
--- a/upload/includes/functions_validate.php
+++ b/upload/includes/functions_validate.php
@@ -74,7 +74,7 @@ function validate_email ($email, $check_ban_and_taken = true)
 {
 	global $lang, $userdata;
 
-	if (!$email || !preg_match('#^([_a-z\d])[a-z\d\.\-_]+@[a-z\d\-]+\.([a-z\d\-]+\.)*?[a-z]{2,4}$#i', $email))
+	if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL))
 	{
 		return $lang['EMAIL_INVALID'];
 	}
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl
index 4e9874f67..2819a000c 100644
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@@ -316,9 +316,9 @@ $(document).ready(function() {
 				<input type="hidden" name="to" value="1" />
 				<input id="search-text" type="text" name="nm" placeholder="{L_SEARCH_S}" required />
 				<select id="search-action">
-					<option value="tracker.php#results" selected="selected"> {L_TRACKER_S} </option>
-					<option value="search.php"> {L_FORUM_S} </option>
-					<option value="tracker.php" class="hash"> {L_HASH_S} </option>
+					<option value="tracker.php#results" selected="selected"> {L_TRACKER_S} </option>
+					<option value="search.php"> {L_FORUM_S} </option>
+					<option value="tracker.php" class="hash"> {L_HASH_S} </option>
 				</select>
 				<input type="submit" class="med" value="{L_SEARCH}" style="width: 55px;" />
 			</form>