#1282 More tweaking to FriendResponse