diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php
index ce070118..20a4d966 100644
--- a/includes/admin/core/class-admin-enqueue.php
+++ b/includes/admin/core/class-admin-enqueue.php
@@ -505,10 +505,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
 			/**
 			 * create gutenberg blocks
 			 */
-			register_block_type( 'um-block/um-user-profile-wall', array(
-				'editor_script' => 'um-blocks-shortcode-js',
-			) );
-
 			register_block_type( 'um-block/um-forms', array(
 				'editor_script' => 'um-blocks-shortcode-js',
 			) );
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index f4134eeb..9131c656 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -367,18 +367,22 @@ function um_user_edit_profile( $args ) {
 		$to_update[ $description_key ] = $args['submitted'][ $description_key ];
 	}
 
-	if ( ! empty( $args['submitted']['role'] ) ) {
-		global $wp_roles;
-		$role_keys = array_map( function( $item ) {
-			return 'um_' . $item;
-		}, get_option( 'um_roles' ) );
-		$exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
+	if ( is_admin() || ( ! is_admin() && ( isset( $fields['role_select'] ) || isset( $fields['role_radio'] ) ) ) ) {  // Secure selected role
 
-		if ( ! in_array( $args['submitted']['role'], $exclude_roles ) ) {
-			$to_update['role'] = $args['submitted']['role'];
+		if ( ! empty( $args['submitted']['role'] ) ) {
+			global $wp_roles;
+			$role_keys = array_map( function( $item ) {
+				return 'um_' . $item;
+			}, get_option( 'um_roles' ) );
+			$exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
+
+			if ( ! in_array( $args['submitted']['role'], $exclude_roles ) ) {
+				$to_update['role'] = $args['submitted']['role'];
+			}
+
+			$args['roles_before_upgrade'] = UM()->roles()->get_all_user_roles( $user_id );
 		}
 
-		$args['roles_before_upgrade'] = UM()->roles()->get_all_user_roles( $user_id );
 	}
 
 	/**
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index a71418b3..4e4e0311 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1574,10 +1574,6 @@ function um_can_view_field( $data ) {
  * @return bool
  */
 function um_can_view_profile( $user_id ) {
-	if ( ! um_user( 'can_view_all' ) && $user_id != get_current_user_id() && is_user_logged_in() ) {
-		return false;
-	}
-
 	if ( UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
 		return true;
 	}
@@ -1589,19 +1585,24 @@ function um_can_view_profile( $user_id ) {
 	$temp_id = um_user('ID');
 	um_fetch_user( get_current_user_id() );
 
+	if ( ! um_user( 'can_view_all' ) && $user_id != get_current_user_id() && is_user_logged_in() ) {
+		um_fetch_user( $temp_id );
+		return false;
+	}
+
 	if ( ! um_user( 'can_access_private_profile' ) && UM()->user()->is_private_profile( $user_id ) ) {
+		um_fetch_user( $temp_id );
 		return false;
 	}
 
 	if ( um_user( 'can_view_roles' ) && $user_id != get_current_user_id() ) {
-
 		$can_view_roles = um_user( 'can_view_roles' );
 
 		if ( ! is_array( $can_view_roles ) ) {
 			$can_view_roles = array();
 		}
 
-		if ( count( array_intersect( UM()->roles()->get_all_user_roles( $user_id ), $can_view_roles ) ) <= 0 ) {
+		if ( count( $can_view_roles ) && count( array_intersect( UM()->roles()->get_all_user_roles( $user_id ), $can_view_roles ) ) <= 0 ) {
 			um_fetch_user( $temp_id );
 			return false;
 		}