diff --git a/core/um-filters-members.php b/core/um-filters-members.php
index 1dd69775..6e00ffc6 100644
--- a/core/um-filters-members.php
+++ b/core/um-filters-members.php
@@ -16,12 +16,14 @@
 		extract( $args );
 
 		$query = $ultimatemember->permalinks->get_query_array();
-
+		
 		foreach( $ultimatemember->members->core_search_fields as $key ) {
-			if ( isset( $query[$key] ) ) {
+			
+			if ( isset( $query[$key] ) && ! empty( $query[$key]  ) ) {
 				$query_args['search']         = '*' . trim($query[$key]) . '*';
 			}
 		}
+		
 		return $query_args;
 	}
 
@@ -109,7 +111,6 @@
 		if ( count ($query_args['meta_query']) == 1 ) {
 			unset( $query_args['meta_query'] );
 		}
-
 		return $query_args;
 
 	}
diff --git a/core/um-members.php b/core/um-members.php
index 9be684ca..991e16af 100644
--- a/core/um-members.php
+++ b/core/um-members.php
@@ -24,7 +24,7 @@ class UM_Members {
 		if ( is_admin() ) {
 			$search_columns[] = 'display_name';
 		} else {
-			$search_columns = array('display_name','user_email');
+			$search_columns = array('display_name','user_email','user_login');
 		}
 		return $search_columns;
 	}
@@ -143,7 +143,7 @@ class UM_Members {
 		$query_args = array();
 		$query_args = apply_filters( 'um_prepare_user_query_args', $query_args, $args );
 		$users = new WP_User_Query( $query_args );
-
+		
 		// number of profiles for mobile
 		if ( $ultimatemember->mobile->isMobile() && isset( $profiles_per_page_mobile ) )
 			$profiles_per_page = $profiles_per_page_mobile;