diff --git src/bp-templates/bp-nouveau/includes/friends/ajax.php src/bp-templates/bp-nouveau/includes/friends/ajax.php
index 7fb0087bb..7eeeaaf8e 100644
--- src/bp-templates/bp-nouveau/includes/friends/ajax.php
+++ src/bp-templates/bp-nouveau/includes/friends/ajax.php
@@ -93,130 +93,138 @@ function bp_nouveau_ajax_addremove_friend() {
 		wp_send_json_error( $response );
 	}
 
-	// Cast fid as an integer.
-	$friend_id = (int) $_POST['item_id'];
-
-	$user = get_user_by( 'id', $friend_id );
-	if ( ! $user ) {
-		wp_send_json_error(
-			array(
-				'feedback' => sprintf(
-					'<div class="bp-feedback error">%s</div>',
-					esc_html__( 'No member found by that ID.', 'buddypress' )
-				),
-			)
-		);
-	}
+	// If the action relates to a friendship, the item ID is a friendship ID.
+	if ( isset( $_POST['action'] ) && ( $_POST['action'] === 'friends_accept_friendship' || $_POST['action'] === 'friends_reject_friendship' ) ) {
+		$friendship_id = (int) $_POST['item_id'];
+
+		if ( 'friends_accept_friendship' === $_POST['action'] ) {
+			if ( ! friends_accept_friendship( $friendship_id ) ) {
+				wp_send_json_error(
+					array(
+						'feedback' => sprintf(
+							'<div class="bp-feedback error">%s</div>',
+							esc_html__( 'There was a problem accepting that request. Please try again.', 'buddypress' )
+						),
+					)
+				);
+			} else {
+				wp_send_json_success(
+					array(
+						'feedback' => sprintf(
+							'<div class="bp-feedback success">%s</div>',
+							esc_html__( 'Friendship accepted.', 'buddypress' )
+						),
+						'type'     => 'success',
+						'is_user'  => true,
+					)
+				);
+			}
 
-	// In the 2 first cases the $friend_id is a friendship id.
-	if ( ! empty( $_POST['action'] ) && 'friends_accept_friendship' === $_POST['action'] ) {
-		if ( ! friends_accept_friendship( $friend_id ) ) {
-			wp_send_json_error(
-				array(
-					'feedback' => sprintf(
-						'<div class="bp-feedback error">%s</div>',
-						esc_html__( 'There was a problem accepting that request. Please try again.', 'buddypress' )
-					),
-				)
-			);
+		// Rejecting a friendship
+		} elseif ( 'friends_reject_friendship' === $_POST['action'] ) {
+			if ( ! friends_reject_friendship( $friendship_id ) ) {
+				wp_send_json_error(
+					array(
+						'feedback' => sprintf(
+							'<div class="bp-feedback error">%s</div>',
+							esc_html__( 'There was a problem rejecting that request. Please try again.', 'buddypress' )
+						),
+					)
+				);
+			} else {
+				wp_send_json_success(
+					array(
+						'feedback' => sprintf(
+							'<div class="bp-feedback success">%s</div>',
+							esc_html__( 'Friendship rejected.', 'buddypress' )
+						),
+						'type'     => 'success',
+						'is_user'  => true,
+					)
+				);
+			}
 		} else {
-			wp_send_json_success(
-				array(
-					'feedback' => sprintf(
-						'<div class="bp-feedback success">%s</div>',
-						esc_html__( 'Friendship accepted.', 'buddypress' )
-					),
-					'type'     => 'success',
-					'is_user'  => true,
-				)
-			);
+			wp_send_json_error( $response );
 		}
 
-	// Rejecting a friendship
-	} elseif ( ! empty( $_POST['action'] ) && 'friends_reject_friendship' === $_POST['action'] ) {
-		if ( ! friends_reject_friendship( $friend_id ) ) {
+	// Otherwise the item ID is a user ID.
+	} else {
+		$user = get_user_by( 'id', $_POST['item_id'] );
+
+		if ( ! $user ) {
 			wp_send_json_error(
 				array(
 					'feedback' => sprintf(
 						'<div class="bp-feedback error">%s</div>',
-						esc_html__( 'There was a problem rejecting that request. Please try again.', 'buddypress' )
+						esc_html__( 'No member found by that ID.', 'buddypress' )
 					),
 				)
 			);
 		} else {
-			wp_send_json_success(
-				array(
-					'feedback' => sprintf(
-						'<div class="bp-feedback success">%s</div>',
-						esc_html__( 'Friendship rejected.', 'buddypress' )
-					),
-					'type'     => 'success',
-					'is_user'  => true,
-				)
-			);
-		}
+			$user_id = $user->ID;
 
-	// Trying to cancel friendship.
-	} elseif ( 'is_friend' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
-		if ( ! friends_remove_friend( bp_loggedin_user_id(), $friend_id ) ) {
-			$response['feedback'] = sprintf(
-				'<div class="bp-feedback error">%s</div>',
-				esc_html__( 'Friendship could not be cancelled.', 'buddypress' )
-			);
+			if ( 'is_friend' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $user_id ) ) {
+				if ( ! friends_remove_friend( bp_loggedin_user_id(), $user_id ) ) {
+					$response['feedback'] = sprintf(
+						'<div class="bp-feedback error">%s</div>',
+						esc_html__( 'Friendship could not be cancelled.', 'buddypress' )
+					);
+
+					wp_send_json_error( $response );
+				} else {
+					$is_user = bp_is_my_profile();
+
+					if ( ! $is_user ) {
+						$response = array( 'contents' => bp_get_add_friend_button( $user_id ) );
+					} else {
+						$response = array(
+							'feedback' => sprintf(
+								'<div class="bp-feedback success">%s</div>',
+								esc_html__( 'Friendship cancelled.', 'buddypress' )
+							),
+							'type'     => 'success',
+							'is_user'  => $is_user,
+						);
+					}
+
+					wp_send_json_success( $response );
+				}
+
+			// Trying to request friendship.
+			} elseif ( 'not_friends' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $user_id ) ) {
+				if ( ! friends_add_friend( bp_loggedin_user_id(), $user_id ) ) {
+					$response['feedback'] = sprintf(
+						'<div class="bp-feedback error">%s</div>',
+						esc_html__( 'Friendship could not be requested.', 'buddypress' )
+					);
+
+					wp_send_json_error( $response );
+				} else {
+					wp_send_json_success( array( 'contents' => bp_get_add_friend_button( $user_id ) ) );
+				}
+
+			// Trying to cancel pending request.
+			} elseif ( 'pending' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $user_id ) ) {
+				if ( friends_withdraw_friendship( bp_loggedin_user_id(), $user_id ) ) {
+					wp_send_json_success( array( 'contents' => bp_get_add_friend_button( $user_id ) ) );
+				} else {
+					$response['feedback'] = sprintf(
+						'<div class="bp-feedback error">%s</div>',
+						esc_html__( 'Friendship request could not be cancelled.', 'buddypress' )
+					);
 
-			wp_send_json_error( $response );
-		} else {
-			$is_user = bp_is_my_profile();
+					wp_send_json_error( $response );
+				}
 
-			if ( ! $is_user ) {
-				$response = array( 'contents' => bp_get_add_friend_button( $friend_id ) );
+			// Request already pending.
 			} else {
-				$response = array(
-					'feedback' => sprintf(
-						'<div class="bp-feedback success">%s</div>',
-						esc_html__( 'Friendship cancelled.', 'buddypress' )
-					),
-					'type'     => 'success',
-					'is_user'  => $is_user,
+				$response['feedback'] = sprintf(
+					'<div class="bp-feedback error">%s</div>',
+					esc_html__( 'Request Pending', 'buddypress' )
 				);
-			}
 
-			wp_send_json_success( $response );
-		}
-
-	// Trying to request friendship.
-	} elseif ( 'not_friends' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
-		if ( ! friends_add_friend( bp_loggedin_user_id(), $friend_id ) ) {
-			$response['feedback'] = sprintf(
-				'<div class="bp-feedback error">%s</div>',
-				esc_html__( 'Friendship could not be requested.', 'buddypress' )
-			);
-
-			wp_send_json_error( $response );
-		} else {
-			wp_send_json_success( array( 'contents' => bp_get_add_friend_button( $friend_id ) ) );
-		}
-
-	// Trying to cancel pending request.
-	} elseif ( 'pending' === BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $friend_id ) ) {
-		if ( friends_withdraw_friendship( bp_loggedin_user_id(), $friend_id ) ) {
-			wp_send_json_success( array( 'contents' => bp_get_add_friend_button( $friend_id ) ) );
-		} else {
-			$response['feedback'] = sprintf(
-				'<div class="bp-feedback error">%s</div>',
-				esc_html__( 'Friendship request could not be cancelled.', 'buddypress' )
-			);
-
-			wp_send_json_error( $response );
+				wp_send_json_error( $response );
+			}
 		}
-
-	// Request already pending.
-	} else {
-		$response['feedback'] = sprintf(
-			'<div class="bp-feedback error">%s</div>',
-			esc_html__( 'Request Pending', 'buddypress' )
-		);
-
-		wp_send_json_error( $response );
 	}
 }