Promoting r272 to live.

@@ -29,7 +29,7 @@ const PASS_MAX_LEN = 15; // Maximum length of password
         if (empty($wpdb->signups)) {
         if (empty($wpdb->signups)) {
             $wpdb->signups = $wpdb->prefix . 'signups';
             $wpdb->signups = $wpdb->prefix . 'signups';
         }
         }
-//die(var_dump(wp_hash_password('a ')));
+
         Vars::$options = new Tools\WP_Option(OPTION_NAME);
         Vars::$options = new Tools\WP_Option(OPTION_NAME);
 
 
         if (is_admin()) {
         if (is_admin()) {

@@ -85,7 +85,7 @@ class UserSearch implements ArrayAccess, Iterator, Countable {
         }
         }
 
 
         // Users table
         // Users table
-        if (!is_null($search_users_table)) {
+        if (!is_null($search_users_table) && empty($field_match)) {
             if (!empty($having_clause)) {
             if (!empty($having_clause)) {
                 $having_clause .= "\n OR `user_id` IN (SELECT `ID` FROM `wp_users` WHERE (`user_login` LIKE '%{$search}%' OR `user_nicename` LIKE '%{$search}%'))";
                 $having_clause .= "\n OR `user_id` IN (SELECT `ID` FROM `wp_users` WHERE (`user_login` LIKE '%{$search}%' OR `user_nicename` LIKE '%{$search}%'))";
             }
             }