diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index 1835e46b..b1bf90f9 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -1017,8 +1017,8 @@ if ( ! class_exists( 'Builtin' ) ) {
                     'required' => 0,
                     'public' => 1,
                     'editable' => 1,
-                    'default' => __('No','ultimate-member'),
-                    'options' => array( __('No','ultimate-member'), __('Yes','ultimate-member') ),
+                    'default' => 'No',
+                    'options' => array( 'No' => __('No','ultimate-member'), 'Yes' => __('Yes','ultimate-member') ),
                     'account_only' => true,
                     'required_opt' => array( 'members_page', 1 ),
                 ),
diff --git a/includes/core/um-actions-account.php b/includes/core/um-actions-account.php
index fdcb20cc..46e4790b 100644
--- a/includes/core/um-actions-account.php
+++ b/includes/core/um-actions-account.php
@@ -179,7 +179,7 @@ function um_submit_account_errors_hook( $args ) {
 			$changes[ $k ] = $v;
 		}
 
-		if ( isset( $changes['hide_in_members'] ) && $changes['hide_in_members'] == __('No','ultimate-member') ) {
+		if ( isset( $changes['hide_in_members'] ) && ( $changes['hide_in_members'] == __('No','ultimate-member') || $changes['hide_in_members'] == 'No' ) ) {
 			delete_user_meta( um_user('ID'), 'hide_in_members' );
 			unset( $changes['hide_in_members'] );
 		}
diff --git a/includes/core/um-filters-members.php b/includes/core/um-filters-members.php
index 0cd12f98..e6adde06 100644
--- a/includes/core/um-filters-members.php
+++ b/includes/core/um-filters-members.php
@@ -60,15 +60,23 @@ if ( ! defined( 'ABSPATH' ) ) exit;
 			$query_args['meta_query'][] = array(
 				"relation"	=> "OR",
 				array(
-                    'key' => 'hide_in_members',
-                    'value' => '',
-                    'compare' => 'NOT EXISTS'
-			    ),
-			    array(
 					'key' => 'hide_in_members',
-					'value' => 'Yes',
-					'compare' => 'NOT LIKE'
-				)
+					'value' => '',
+					'compare' => 'NOT EXISTS'
+				),
+				array(
+					"relation"	=> "AND",
+					array(
+						'key' => 'hide_in_members',
+						'value' => __('Yes','ultimate-member'),
+						'compare' => 'NOT LIKE'
+					),
+					array(
+						'key' => 'hide_in_members',
+						'value' => 'Yes',
+						'compare' => 'NOT LIKE'
+					),
+				),
 			);
 		}