Added conversion from friend_id to client_id