diff --git a/includes/core/um-actions-login.php b/includes/core/um-actions-login.php
index f6d74f06..4ed1979d 100644
--- a/includes/core/um-actions-login.php
+++ b/includes/core/um-actions-login.php
@@ -177,6 +177,7 @@ add_action( 'um_on_login_before_redirect', 'um_store_lastlogin_timestamp', 10, 1
 function um_store_lastlogin_timestamp_( $login ) {
 	$user = get_user_by( 'login', $login );
 	um_store_lastlogin_timestamp( $user->ID );
+	delete_user_meta( $user->ID, 'password_rst_attempts' );
 }
 add_action( 'wp_login', 'um_store_lastlogin_timestamp_' );
 
diff --git a/includes/core/um-filters-members.php b/includes/core/um-filters-members.php
index 537e25d1..0cbd551c 100644
--- a/includes/core/um-filters-members.php
+++ b/includes/core/um-filters-members.php
@@ -53,28 +53,30 @@ function um_remove_special_users_from_list( $query_args, $args ) {
 
 	}
 
-	if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) || UM()->options()->get( 'account_hide_in_directory' ) ) {
-		$query_args['meta_query'][] = array(
-			"relation"	=> "OR",
-			array(
-				'key' => 'hide_in_members',
-				'value' => '',
-				'compare' => 'NOT EXISTS'
-			),
-			array(
-				"relation"	=> "AND",
+	if ( UM()->options()->get( 'account_hide_in_directory' ) ) {
+		if ( ! UM()->roles()->um_user_can( 'can_access_private_profile' ) ) {
+			$query_args['meta_query'][] = array(
+				"relation"	=> "OR",
 				array(
 					'key' => 'hide_in_members',
-					'value' => __('Yes','ultimate-member'),
-					'compare' => 'NOT LIKE'
+					'value' => '',
+					'compare' => 'NOT EXISTS'
 				),
 				array(
-					'key' => 'hide_in_members',
-					'value' => 'Yes',
-					'compare' => 'NOT LIKE'
+					"relation"	=> "AND",
+					array(
+						'key' => 'hide_in_members',
+						'value' => __('Yes','ultimate-member'),
+						'compare' => 'NOT LIKE'
+					),
+					array(
+						'key' => 'hide_in_members',
+						'value' => 'Yes',
+						'compare' => 'NOT LIKE'
+					),
 				),
-			),
-		);
+			);
+		}
 	}
 
 	$roles = um_user( 'can_view_roles' );
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index 6db1e71c..ed5c4555 100644
--- a/languages/ultimate-member-en_US.po
+++ b/languages/ultimate-member-en_US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ultimate Member\n"
-"POT-Creation-Date: 2019-02-06 18:21+0200\n"
-"PO-Revision-Date: 2019-02-06 18:21+0200\n"
+"POT-Creation-Date: 2019-02-07 15:40+0200\n"
+"PO-Revision-Date: 2019-02-07 15:40+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -249,7 +249,7 @@ msgstr ""
 #: includes/admin/templates/form/register_customize.php:77
 #: includes/admin/templates/form/register_gdpr.php:24
 #: includes/core/class-builtin.php:1130 includes/core/class-builtin.php:1145
-#: includes/core/um-filters-members.php:68
+#: includes/core/um-filters-members.php:69
 msgid "Yes"
 msgstr ""
 
@@ -6776,15 +6776,15 @@ msgstr ""
 msgid "Password is incorrect. Please try again."
 msgstr ""
 
-#: includes/core/um-actions-login.php:195
+#: includes/core/um-actions-login.php:196
 msgid "This action has been prevented for security measures."
 msgstr ""
 
-#: includes/core/um-actions-login.php:419
+#: includes/core/um-actions-login.php:420
 msgid "Keep me signed in"
 msgstr ""
 
-#: includes/core/um-actions-login.php:463
+#: includes/core/um-actions-login.php:464
 msgid "Forgot your password?"
 msgstr ""
 
diff --git a/readme.txt b/readme.txt
index 15c342b7..a066bcda 100644
--- a/readme.txt
+++ b/readme.txt
@@ -148,6 +148,7 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
   - Fixed member directory notices with disabled metadata
   - Fixed textarea profile field formatting
   - Fixed registration without username field
+  - Fixed flush password reset limit after successfully login
 
 = 2.0.38: January 10, 2019 =