diff --git a/inc/jwt/rest-api/version1/class-lp-rest-users-v1-controller.php b/inc/jwt/rest-api/version1/class-lp-rest-users-v1-controller.php
index c19a20e38..da89fbb9d 100644
--- a/inc/jwt/rest-api/version1/class-lp-rest-users-v1-controller.php
+++ b/inc/jwt/rest-api/version1/class-lp-rest-users-v1-controller.php
@@ -128,14 +128,6 @@ public function register_routes() {
 	}
 
 	public function get_items_permissions_check( $request ) {
-		if ( ! empty( $request['roles'] ) && ! ( in_array( 'lp_teacher', $request['roles'] ) || in_array( 'subscriber', $request['roles'] ) ) && ! current_user_can( 'list_users' ) ) {
-			return new WP_Error(
-				'rest_user_cannot_view',
-				__( 'Sorry, you are not allowed to filter users by role.' ),
-				array( 'status' => rest_authorization_required_code() )
-			);
-		}
-
 		return true;
 	}
 
@@ -1018,7 +1010,9 @@ public function get_users_data( $user, $context = 'view' ) {
 					$data['id'] = $user->ID;
 					break;
 				case 'username':
-					$data['username'] = $user->user_login;
+					if ( current_user_can( 'list_users' ) || current_user_can( 'edit_user', $user->ID ) ) {
+						$data['username'] = $user->user_login;
+					}
 					break;
 				case 'name':
 					$data['name'] = $user->display_name;
@@ -1030,7 +1024,9 @@ public function get_users_data( $user, $context = 'view' ) {
 					$data['last_name'] = $user->last_name;
 					break;
 				case 'email':
-					$data['email'] = $user->user_email;
+					if ( current_user_can( 'list_users' ) || current_user_can( 'edit_user', $user->ID ) ) {
+						$data['email'] = $user->user_email;
+					}
 					break;
 				case 'url':
 					$data['url'] = $user->user_url;
@@ -1308,7 +1304,7 @@ public function get_item_schema() {
 				'username'           => array(
 					'description' => __( 'Login name for the user.' ),
 					'type'        => 'string',
-					'context'     => array( 'edit' ),
+					'context'     => array( 'view', 'edit' ),
 					'required'    => true,
 					'arg_options' => array(
 						'sanitize_callback' => array( $this, 'check_username' ),
@@ -1342,7 +1338,7 @@ public function get_item_schema() {
 					'description' => __( 'The email address for the user.' ),
 					'type'        => 'string',
 					'format'      => 'email',
-					'context'     => array( 'edit' ),
+					'context'     => array( 'view', 'edit' ),
 					'required'    => true,
 				),
 				'url'                => array(
@@ -1372,7 +1368,7 @@ public function get_item_schema() {
 				'nickname'           => array(
 					'description' => __( 'The nickname for the user.' ),
 					'type'        => 'string',
-					'context'     => array( 'edit' ),
+					'context'     => array( 'view', 'edit' ),
 					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),